diff -Nru fbset-2.1/debian/changelog fbset-2.1/debian/changelog
--- fbset-2.1/debian/changelog	2017-05-09 23:08:11.000000000 +0000
+++ fbset-2.1/debian/changelog	2017-05-09 23:39:37.000000000 +0000
@@ -1,8 +1,8 @@
-fbset (2.1-29build1) artful; urgency=medium
+fbset (2.1-29ubuntu1) artful; urgency=medium
 
-  * No-change rebuild to work around launchpad bug #1685672
+  * Fix udeb FTBFS due to applying PIE link flags but not compile flags.
 
- -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 May 2017 17:08:11 -0600
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 May 2017 17:39:37 -0600
 
 fbset (2.1-29) unstable; urgency=medium
 
diff -Nru fbset-2.1/debian/control fbset-2.1/debian/control
--- fbset-2.1/debian/control	2017-01-18 23:38:53.000000000 +0000
+++ fbset-2.1/debian/control	2017-05-09 23:39:37.000000000 +0000
@@ -1,7 +1,8 @@
 Source: fbset
 Section: admin
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Homepage: http://users.telenet.be/geertu/Linux/fbdev/
 Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/fbset.git
 Vcs-Git: https://git.hadrons.org/git/debian/pkgs/fbset.git
diff -Nru fbset-2.1/debian/rules fbset-2.1/debian/rules
--- fbset-2.1/debian/rules	2017-01-19 00:05:02.000000000 +0000
+++ fbset-2.1/debian/rules	2017-05-09 23:39:35.000000000 +0000
@@ -9,12 +9,10 @@
 
 include /usr/share/dpkg/default.mk
 
-CFLAGS_UDEB := -Wall
+CFLAGS_UDEB := $(CFLAGS)
 DIR_FLAGS = srcdir=.. VPATH=..
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS_UDEB += -O0
-else
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS_UDEB += -Os -fomit-frame-pointer
 endif