diff -Nru aoeui-1.6~dfsg/debian/changelog aoeui-1.6~dfsg/debian/changelog
--- aoeui-1.6~dfsg/debian/changelog	2012-01-28 16:28:55.000000000 +0000
+++ aoeui-1.6~dfsg/debian/changelog	2012-04-27 14:53:35.000000000 +0000
@@ -1,3 +1,13 @@
+aoeui (1.6~dfsg-2) unstable; urgency=low
+
+  [ Cyril Roelandt ]
+  * No longer FTBFS on hurd, 05_ftbfs_hurd_mremap.diff. (Closes: #670546)
+
+  [ Ryan Kavanagh ]
+  * Bump Standards to 3.9.3
+
+ -- Ryan Kavanagh <rak@debian.org>  Fri, 27 Apr 2012 10:52:49 -0400
+
 aoeui (1.6~dfsg-1) unstable; urgency=low
 
   * Imported Upstream version 1.6
diff -Nru aoeui-1.6~dfsg/debian/control aoeui-1.6~dfsg/debian/control
--- aoeui-1.6~dfsg/debian/control	2012-01-28 16:28:55.000000000 +0000
+++ aoeui-1.6~dfsg/debian/control	2012-04-27 14:53:33.000000000 +0000
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 8),
  exuberant-ctags,
  m4
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/aoeui/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/aoeui.git
 Vcs-Git: git://git.debian.org/collab-maint/aoeui.git
diff -Nru aoeui-1.6~dfsg/debian/patches/05_hurd_ftbfs_mremap.diff aoeui-1.6~dfsg/debian/patches/05_hurd_ftbfs_mremap.diff
--- aoeui-1.6~dfsg/debian/patches/05_hurd_ftbfs_mremap.diff	1970-01-01 00:00:00.000000000 +0000
+++ aoeui-1.6~dfsg/debian/patches/05_hurd_ftbfs_mremap.diff	2012-04-27 13:50:40.000000000 +0000
@@ -0,0 +1,32 @@
+Description: Fix FTBFS on hurd
+ mremap is Linux specific and not available on hurd. Fix this with a fake
+ mremap.
+Author: Cyril Roelandt <tipecaml@gmail.com>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/670546
+Forwarded: no
+Reviewed-by: Ryan Kavanagh <rak@debian.org>
+Last-Update: 2012-04-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/buffer.c b/buffer.c
+index ebec0da..2501e03 100644
+--- a/buffer.c
++++ b/buffer.c
+@@ -23,6 +23,16 @@
+  *	and for undo histories.
+  */
+ 
++#ifndef __linux__
++static inline void *fake_mremap(void *old_address, size_t old_size, size_t new_size, int flags)
++{
++	(void) flags;
++	munmap(old_address, old_size);
++	return mmap(old_address, new_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
++}
++#define mremap fake_mremap
++#endif
++
+ struct buffer *buffer_create(char *path)
+ {
+ 	struct buffer *buffer = allocate0(sizeof *buffer);
diff -Nru aoeui-1.6~dfsg/debian/patches/series aoeui-1.6~dfsg/debian/patches/series
--- aoeui-1.6~dfsg/debian/patches/series	2012-01-28 16:28:55.000000000 +0000
+++ aoeui-1.6~dfsg/debian/patches/series	2012-04-27 13:46:49.000000000 +0000
@@ -1,2 +1,3 @@
 03_txt_files.diff
 04_inst_dir.diff
+05_hurd_ftbfs_mremap.diff