diff -pruN 2.0.5-1.1/debian/changelog 2.0.5-1.1ubuntu1/debian/changelog
--- 2.0.5-1.1/debian/changelog	2014-05-11 03:39:25.000000000 +0000
+++ 2.0.5-1.1ubuntu1/debian/changelog	2014-05-11 03:39:25.000000000 +0000
@@ -1,3 +1,10 @@
+openvas-client (2.0.5-1.1ubuntu1) utopic; urgency=medium
+
+  * Use dh_autotools-dev instead of manually copying config.{sub,guess} to fix
+    FTBFS on arm64 and ppc64el.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 10 May 2014 21:56:44 -0400
+
 openvas-client (2.0.5-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -pruN 2.0.5-1.1/debian/control 2.0.5-1.1ubuntu1/debian/control
--- 2.0.5-1.1/debian/control	2014-05-11 03:39:25.000000000 +0000
+++ 2.0.5-1.1ubuntu1/debian/control	2014-05-11 03:39:25.000000000 +0000
@@ -1,7 +1,8 @@
 Source: openvas-client
 Section: net
 Priority: extra
-Maintainer: Debian OpenVAS Maintainers <openvas-distro-deb@wald.intevation.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenVAS Maintainers <openvas-distro-deb@wald.intevation.org>
 Uploaders: Tim Brown <timb@nth-dimension.org.uk>, Javier Fernandez-Sanguino Pen~a <jfs@debian.org>, Jan Wagner <waja@cyconet.org>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libssl-dev, libgtk2.0-dev, libgdchart-gd2-noxpm-dev
 Homepage: http://www.openvas.org/
diff -pruN 2.0.5-1.1/debian/rules 2.0.5-1.1ubuntu1/debian/rules
--- 2.0.5-1.1/debian/rules	2014-05-11 03:39:25.000000000 +0000
+++ 2.0.5-1.1ubuntu1/debian/rules	2014-05-11 03:39:25.000000000 +0000
@@ -25,12 +25,7 @@ endif
 config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	dh_autotools-dev_updateconfig
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
@@ -63,9 +58,10 @@ clean-patched:
 	-rm -f po/*gmo # Not sure if we should use 'maintainer-clean' instead..
 	-rm -f po/stamp-po
 	# Add here commands to clean up after the build process.
+	dh_autotools-dev_updateconfig
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
 
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 unpatch: