diff -u upstart-0.6.0/debian/rules upstart-0.6.0/debian/rules
--- upstart-0.6.0/debian/rules
+++ upstart-0.6.0/debian/rules
@@ -30,6 +30,12 @@
 	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+CHECK_VARS =
+ifeq ($(DEB_HOST_ARCH),armel)
+CHECK_VARS += CFLAGS="$(filter-out -fPIE,$(CFLAGS))"
+endif
+
 
 # Run the package configure script
 config.status: configure
@@ -46,7 +52,7 @@
 	dh_testdir
 
 	$(MAKE)
-	$(MAKE) check || true
+	$(MAKE) check $(CHECK_VARS) || true
 	touch $@
 
 # Install the package underneath debian/tmp
diff -u upstart-0.6.0/debian/changelog upstart-0.6.0/debian/changelog
--- upstart-0.6.0/debian/changelog
+++ upstart-0.6.0/debian/changelog
@@ -1,3 +1,9 @@
+upstart (0.6.0-4) karmic; urgency=low
+
+  * Don't build the testsuite with -fPIE on armel; LP: #398403.
+
+ -- Loïc Minier <lool@dooz.org>  Mon, 13 Jul 2009 22:12:34 +0200
+
 upstart (0.6.0-3) karmic; urgency=low
 
   * Add Conflicts on older Upstart packages to make update-manager's