diff --git a/debian/changelog b/debian/changelog
index df0c732..aee359c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pixman (0.15.20-1) UNRELEASED; urgency=low
   * New upstream release candidate.
   * Bump shlibs and update symbols file for
     pixman_disable_out_of_bounds_workaround and new formats.
+  * Add patch to disable use of env vars to force hwcap and platform on arm.
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 21 Jul 2009 16:22:58 +0200
 
diff --git a/debian/control b/debian/control
index 3d5de18..5e9ae3f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>
-Build-Depends: debhelper (>= 5), automake, autoconf, libtool, pkg-config
+Build-Depends: debhelper (>= 5), automake, autoconf, libtool, pkg-config, quilt
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/pixman
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/pixman.git
diff --git a/debian/patches/pixman-arm-don-t-use-env-vars-to-get-hwcap-platform.patch b/debian/patches/pixman-arm-don-t-use-env-vars-to-get-hwcap-platform.patch
new file mode 100644
index 0000000..a060561
--- /dev/null
+++ b/debian/patches/pixman-arm-don-t-use-env-vars-to-get-hwcap-platform.patch
@@ -0,0 +1,52 @@
+From 2beb82c292725ad500db9d564ca73dd6c2bce463 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 23 Aug 2009 12:31:21 +0200
+Subject: [PATCH] pixman/arm: don't use env vars to get hwcap/platform
+
+---
+ pixman/pixman-cpu.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
+index a2a7b8a..af16715 100644
+--- a/pixman/pixman-cpu.c
++++ b/pixman/pixman-cpu.c
+@@ -253,8 +253,10 @@ pixman_arm_read_auxv ()
+ 	    if (aux.a_type == AT_HWCAP)
+ 	    {
+ 		uint32_t hwcap = aux.a_un.a_val;
++#if 0
+ 		if (getenv ("ARM_FORCE_HWCAP"))
+ 		    hwcap = strtoul (getenv ("ARM_FORCE_HWCAP"), NULL, 0);
++#endif
+ 		/* hardcode these values to avoid depending on specific
+ 		 * versions of the hwcap header, e.g. HWCAP_NEON
+ 		 */
+@@ -266,8 +268,10 @@ pixman_arm_read_auxv ()
+ 	    else if (aux.a_type == AT_PLATFORM)
+ 	    {
+ 		const char *plat = (const char*) aux.a_un.a_val;
++#if 0
+ 		if (getenv ("ARM_FORCE_PLATFORM"))
+ 		    plat = getenv ("ARM_FORCE_PLATFORM");
++#endif
+ 		if (strncmp (plat, "v7l", 3) == 0)
+ 		{
+ 		    arm_has_v7 = TRUE;
+@@ -281,11 +285,13 @@ pixman_arm_read_auxv ()
+ 	}
+ 	close (fd);
+ 
++#if 0
+ 	/* if we don't have 2.6.29, we have to do this hack; set
+ 	 * the env var to trust HWCAP.
+ 	 */
+ 	if (!getenv ("ARM_TRUST_HWCAP") && arm_has_v7)
+ 	    arm_has_neon = TRUE;
++#endif
+     }
+ 
+     arm_tests_initialized = TRUE;
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..21a8c56
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pixman-arm-don-t-use-env-vars-to-get-hwcap-platform.patch
diff --git a/debian/rules b/debian/rules
index 534ac3e..88ea93d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 PACKAGE = libpixman-1-0
 SHLIBS_VERSION = 0.15.16
 
@@ -24,7 +26,7 @@ else
 endif
 
 autogen: autogen-stamp
-autogen-stamp:
+autogen-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	autoreconf -vfi
 	touch $@
@@ -50,7 +52,7 @@ build-stamp: config-stamp
 	
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f autogen-stamp config-stamp build-stamp install-stamp