diff --git a/mesa.spec b/mesa.spec
index e5d06fd..81ce484 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.3.2
-Release: 6
+Release: 7
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -50,7 +50,6 @@ Source10: r200_vtxtmp_x86.S
 Source11: radeon_vtxtmp_x86.S
 #Patch0: mesa-6.3.2-makedepend.patch
 Patch0: mesa-6.3.2-build-configuration-v4.patch
-Patch1: mesa-6.3.2-fix-installmesa.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 BuildRequires: libdrm-devel
@@ -197,7 +196,6 @@ cp %{SOURCE10} src/mesa/drivers/dri/r200/
 cp %{SOURCE11} src/mesa/drivers/dri/radeon/
 
 #%patch0 -p0 -b .makedepend
-%patch1 -p0 -b .fix-installmesa
 
 
 #-- Build ------------------------------------------------------------
@@ -214,7 +212,16 @@ make ${MESATARGET} %{makeopts}
 %install
 rm -rf $RPM_BUILD_ROOT
 #%%makeinstall DESTDIR=$RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT/usr
+
+# The mesa make install target use a small shell script that doesn't
+# know about multilib systems.  The crux of the shell script is
+# basically these 5 lines, so we just do it here.
+
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/GL
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+cp -f include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -fd %{_lib}/lib* $RPM_BUILD_ROOT%{_libdir}
 
 %if %{with_dri}
 export DRIMODULE_SRCDIR="%{_lib}"
@@ -349,6 +356,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 15 2005 Kristian Høgsberg <krh@redhat.com> 6.3.2-7
+- Copy files manually instead of using the mesa install script.
+
 * Tue Sep 13 2005 Mike A. Harris <mharris@redhat.com> 6.3.2-6
 - Fix redhat-mesa-driver-install and spec file to work right on multilib
   systems.