diff -u gramadoir-0.6/debian/changelog gramadoir-0.6/debian/changelog
--- gramadoir-0.6/debian/changelog
+++ gramadoir-0.6/debian/changelog
@@ -1,3 +1,11 @@
+gramadoir (0.6-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Auto-update config.{guess,sub} to fix FTBFS on GNU/kFreeBSD.  Thanks
+    Aurelien Jarno.  (Closes: #320199)
+
+ -- Robert Millan <rmh@debian.org>  Fri, 27 Apr 2012 21:52:45 +0200
+
 gramadoir (0.6-4) unstable; urgency=low
 
   * Move /usr/bin/* from liblibgua-ga-gramadoir-perl. Closes: #481586.
diff -u gramadoir-0.6/debian/control gramadoir-0.6/debian/control
--- gramadoir-0.6/debian/control
+++ gramadoir-0.6/debian/control
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry@debian.org>
-Build-Depends: dbs, debhelper (>= 5)
+Build-Depends: dbs, debhelper (>= 5), autotools-dev
 Build-Depends-Indep: libstring-approx-perl, liblocale-po-perl
 Homepage: http://borel.slu.edu/gramadoir/index.html
 Standards-Version: 3.8.0
diff -u gramadoir-0.6/debian/rules gramadoir-0.6/debian/rules
--- gramadoir-0.6/debian/rules
+++ gramadoir-0.6/debian/rules
@@ -30,6 +30,7 @@
 ${STAMP_DIR}/configure-stamp: $(patched)
 	dh_testdir
 	mv build-tree/gramadoir-ga-0.60 build-tree/gramadoir-0.6
+	cp -f /usr/share/misc/config.{guess,sub} $(BUILD_TREE)/
 	( cd $(BUILD_TREE) && ./configure --prefix=/usr \
 	  --libexecdir=/usr/lib/gramadoir )
 	touch $@