diff -pruN 0.5.4-2/debian/changelog 0.5.4-2ubuntu2/debian/changelog
--- 0.5.4-2/debian/changelog	2011-02-06 17:13:43.000000000 +0000
+++ 0.5.4-2ubuntu2/debian/changelog	2011-02-06 17:11:04.000000000 +0000
@@ -1,9 +1,30 @@
+archfs (0.5.4-2ubuntu2) natty; urgency=low
+
+  * Add -lfuse to LIBS to fix ftbfs with binutils-gold
+
+ -- Angel Abad <angelabad@ubuntu.com>  Sun, 06 Feb 2011 15:31:43 +0100
+
+archfs (0.5.4-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #592718), remaining changes:
+    - layout/support.c: O_CREAT forces a third argument, so provide one;
+      fixes FTBFS
+
+ -- Lorenzo De Liso <blackzldl@gmail.com>  Fri, 11 Jun 2010 17:28:51 +0200
+
 archfs (0.5.4-2) unstable; urgency=low
 
   * Honour TMPDIR. Closes: #552229.
 
  -- Jon Dowland <jmtd@debian.org>  Fri, 04 Jun 2010 23:44:55 +0100
 
+archfs (0.5.4-1ubuntu1) lucid; urgency=low
+
+  * layout/support.c: O_CREAT forces a third argument, so provide one;
+    fixes FTBFS
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sat, 02 Jan 2010 22:58:24 -0500
+
 archfs (0.5.4-1) unstable; urgency=low
 
   * Initial release Closes: #471536.
diff -pruN 0.5.4-2/debian/control 0.5.4-2ubuntu2/debian/control
--- 0.5.4-2/debian/control	2011-02-06 17:13:43.000000000 +0000
+++ 0.5.4-2ubuntu2/debian/control	2011-02-06 17:11:04.000000000 +0000
@@ -1,7 +1,8 @@
 Source: archfs
 Section: utils
 Priority: optional
-Maintainer: Jon Dowland <jmtd@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jon Dowland <jmtd@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libfuse-dev, libz-dev, pkg-config
 Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/archfs/
diff -pruN 0.5.4-2/layout/support.c 0.5.4-2ubuntu2/layout/support.c
--- 0.5.4-2/layout/support.c	2007-08-17 17:44:14.000000000 +0100
+++ 0.5.4-2ubuntu2/layout/support.c	2011-02-06 17:11:04.000000000 +0000
@@ -71,7 +71,7 @@ int unzip_revs(char *path){
                 gstrdel(extension);
             	if (gmstrcpy(&mirror, tmp_file, "/", entry->d_name, 0) == -1)
             		continue;
-            	if ((descriptor = open(mirror, O_WRONLY | O_CREAT)) == -1)
+		if ((descriptor = open(mirror, O_WRONLY | O_CREAT, S_IRWXU)) == -1)
             		continue;
             	if (close(descriptor) == -1)
             		continue;
diff -pruN 0.5.4-2/Makefile.in 0.5.4-2ubuntu2/Makefile.in
--- 0.5.4-2/Makefile.in	2008-11-30 15:35:03.000000000 +0000
+++ 0.5.4-2ubuntu2/Makefile.in	2011-02-06 17:11:04.000000000 +0000
@@ -116,7 +116,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lfuse
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@