diff -u automake1.9-1.9.6+nogfdl/debian/changelog automake1.9-1.9.6+nogfdl/debian/changelog
--- automake1.9-1.9.6+nogfdl/debian/changelog
+++ automake1.9-1.9.6+nogfdl/debian/changelog
@@ -1,3 +1,18 @@
+automake1.9 (1.9.6+nogfdl-4ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Fix m4/python.m4 (AM_PATH_PYTHON).
+    - Don't bump the priority for the alternatives.
+
+ -- Logan Rosen <logatronico@gmail.com>  Tue, 23 Oct 2012 17:30:35 -0400
+
+automake1.9 (1.9.6+nogfdl-4) unstable; urgency=low
+
+  * lib/am/distdir.am: Backport fix for CVE-2012-3386 "Temporary worldwide
+    write permissions during make distcheck". (Closes: #681118)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 10 Jul 2012 20:11:40 -0400
+
 automake1.9 (1.9.6+nogfdl-3.1ubuntu1) natty; urgency=low
 
   * Merge with Debian; remaining changes:
diff -u automake1.9-1.9.6+nogfdl/debian/control automake1.9-1.9.6+nogfdl/debian/control
--- automake1.9-1.9.6+nogfdl/debian/control
+++ automake1.9-1.9.6+nogfdl/debian/control
@@ -1,7 +1,8 @@
 Source: automake1.9
 Section: devel
 Priority: optional
-Maintainer: Eric Dorland <eric@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Eric Dorland <eric@debian.org>
 Standards-Version: 3.7.2.1
 Build-Depends: cdbs, debhelper (>= 4.1.0)
 Build-Depends-Indep: autoconf (>= 2.59), autotools-dev (>= 20020320.1), texinfo (>= 4.3)
diff -u automake1.9-1.9.6+nogfdl/lib/am/distdir.am automake1.9-1.9.6+nogfdl/lib/am/distdir.am
--- automake1.9-1.9.6+nogfdl/lib/am/distdir.am
+++ automake1.9-1.9.6+nogfdl/lib/am/distdir.am
@@ -323,7 +323,7 @@
 ## Make the new source tree read-only.  Distributions ought to work in
 ## this case.  However, make the top-level directory writable so we
 ## can make our new subdirs.
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 ## Undo the write access.