diff -u mesa-8.1~git20120713.e3ff4d4c/debian/rules mesa-8.1~git20120713.e3ff4d4c/debian/rules
--- mesa-8.1~git20120713.e3ff4d4c/debian/rules
+++ mesa-8.1~git20120713.e3ff4d4c/debian/rules
@@ -79,6 +79,10 @@
     endif
   endif
 
+# Disable asm temporarily while out of tree builds are broken on i386
+  ifeq (,$(filter $(DEB_HOST_ARCH_CPU), i386))
+  	confflags_common += --disable-asm
+  endif
 
 # Build the llvmpipe driver only on amd64, i386 until it's tested elsewhere
   ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
diff -u mesa-8.1~git20120713.e3ff4d4c/debian/changelog mesa-8.1~git20120713.e3ff4d4c/debian/changelog
--- mesa-8.1~git20120713.e3ff4d4c/debian/changelog
+++ mesa-8.1~git20120713.e3ff4d4c/debian/changelog
@@ -1,4 +1,4 @@
-mesa (8.1~git20120713.e3ff4d4c-0ubuntu0ricotz7~precise) precise; urgency=critical
+mesa (8.1~git20120713.e3ff4d4c-0ubuntu0ricotz8~precise) precise; urgency=critical
 
   [ Rico Tzschichholz ]
   * Checkout from git 20120713 (master branch) up to commit
@@ -18,7 +18,7 @@
   * hook: Fix out of tree builds.
 
   [ Robert Hooker ]
-  * Attempt to fix out of tree libmesa build
+  * Disable asm on i386 temporarily
 
  -- Robert Hooker <sarvatt@ubuntu.com>  Fri, 13 Jul 2012 15:15:37 -0400
 
reverted:
--- mesa-8.1~git20120713.e3ff4d4c/debian/patches/libmesa.diff
+++ mesa-8.1~git20120713.e3ff4d4c.orig/debian/patches/libmesa.diff
@@ -1,21 +0,0 @@
---- mesa-8.1~git20120713.e3ff4d4c/src/mesa/Makefile.am	2012-07-13 14:08:43.000000000 -0400
-+++ mesa-8.1~git20120713.e3ff4d4c.new/src/mesa/Makefile.am	2012-07-13 15:14:45.222305004 -0400
-@@ -106,12 +106,18 @@
- 
- if HAVE_X86_ASM
- MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
-+libmesa_la_CPPFLAGS= $(AM_CPPFLAGS) \
-+	-I$(top_builddir)/src/mesa/x86
- endif
- if HAVE_X86_64_ASM
- MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
-+libmesa_la_CPPFLAGS= $(AM_CPPFLAGS) \
-+	-I$(top_builddir)/src/mesa/x86-64
- endif
- if HAVE_SPARC_ASM
- MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES)
-+libmesa_la_CPPFLAGS= $(AM_CPPFLAGS) \
-+	-I$(top_builddir)/src/mesa/sparc
- endif
- 
- libmesa_la_SOURCES = \
diff -u mesa-8.1~git20120713.e3ff4d4c/debian/patches/series mesa-8.1~git20120713.e3ff4d4c/debian/patches/series
--- mesa-8.1~git20120713.e3ff4d4c/debian/patches/series
+++ mesa-8.1~git20120713.e3ff4d4c/debian/patches/series
@@ -18 +17,0 @@
-libmesa.diff