diff -u atftp-0.7.git20120829/debian/changelog atftp-0.7.git20120829/debian/changelog
--- atftp-0.7.git20120829/debian/changelog
+++ atftp-0.7.git20120829/debian/changelog
@@ -1,3 +1,12 @@
+atftp (0.7.git20120829-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-5": apply patch from Martin Michlmayr to debian/rules:
+    use GNU89 inline style, and adjust buildflags handling.
+    (Closes: #777783)
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 18 Jul 2015 17:09:34 +0200
+
 atftp (0.7.git20120829-2) unstable; urgency=low
 
   * atftpd.postinst uses invalid protocol bug fixed. Closes: #688693
diff -u atftp-0.7.git20120829/debian/rules atftp-0.7.git20120829/debian/rules
--- atftp-0.7.git20120829/debian/rules
+++ atftp-0.7.git20120829/debian/rules
@@ -12,10 +12,8 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-  
+dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS="hardening=+all" DEB_CFLAGS_MAINT_APPEND="-Wall -pedantic -std=gnu89" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed" dpkg-buildflags
+
 configure: configure-stamp
 
 configure-stamp:
@@ -23,7 +21,7 @@
 	# Add here commands to configure the package.
 	./autogen.sh
 	#./configure --prefix=/usr --mandir=/usr/share/man
-	dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -- $(shell $(dpkg_buildflags) --export=configure)
 
 	touch configure-stamp