diff --git a/mesa.spec b/mesa.spec
index 7b5d348..e79cbee 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -73,6 +73,7 @@ Patch2: mesa-6.4-multilib-fix.patch
 Patch3: mesa-modular-dri-dir.patch
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch5: mesa-6.5-drop-static-inline.patch
+Patch6: mesa-6.5-noexecstack.patch
 
 # General patches from upstream go here:
 
@@ -239,6 +240,7 @@ install -m 755 %{SOURCE12} ./
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
 %patch5 -p0 -b .drop-static-inline
+%patch6 -p0 -b .noexecstack
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -430,6 +432,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Apr 10 2006 Kristian Høgsberg <krh@redhat.com> 6.5-3
+- Add mesa-6.5-noexecstack.patch to prevent assembly files from making
+  libGL.so have executable stack.
+
 * Mon Apr 10 2006 Kristian Høgsberg <krh@redhat.com> 6.5-2
 - Bump for fc5 build.
 - Bump libdrm requires to 2.0.1.