diff --git a/gmp-noexec.diff b/gmp-noexec.diff
new file mode 100644
index 0000000..ee6a9d1
--- /dev/null
+++ b/gmp-noexec.diff
@@ -0,0 +1,15 @@
+--- mpn/m4-ccas.xx	2007-01-13 19:33:32.000000000 +0100
++++ mpn/m4-ccas	2007-01-13 19:34:19.000000000 +0100
+@@ -88,8 +88,11 @@
+   CC="$CC -o $BASENAME.o"
+ fi
+ 
++echo '.section .note.GNU-stack,"",@progbits' > $TMP
++echo '.previous' >> $TMP
++
+ echo "$M4 $DEFS $ASM >$TMP"
+-$M4 $DEFS $ASM >$TMP || exit
++$M4 $DEFS $ASM >>$TMP || exit
+ 
+ echo "$CC"
+ $CC || exit
diff --git a/gmp.changes b/gmp.changes
index 52f1ff6..39ad0ac 100644
--- a/gmp.changes
+++ b/gmp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jan 13 20:11:14 CET 2007 - meissner@suse.de
+
+- Mark assembler code as not needing exec stack/heap by hacking
+  the m4 -> assembler wrapper script.
+- Run "make check", as mandated by our packaging guidelines.
+
 -------------------------------------------------------------------
 Fri Oct 13 21:24:30 CEST 2006 - aj@suse.de
 
diff --git a/gmp.spec b/gmp.spec
index e2868df..0fd3a53 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gmp (Version 4.2.1)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,11 +12,11 @@
 
 Name:           gmp
 BuildRequires:  gcc-c++
-License:        GPL, LGPL
+License:        GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Autoreqprov:    on
 Version:        4.2.1
-Release:        2
+Release:        17
 Summary:        The GNU MP Library
 URL:            http://www.swox.com/gmp/
 Source:         ftp://prep.ai.mit.edu/pub/gnu/gmp/gmp-%{version}.tar.bz2
@@ -27,6 +27,7 @@ Patch3:         %{name}-%{version}-configure.arm-double.diff
 Patch4:         %{name}-%{version}-configure-ppc.diff
 Patch5:         %{name}-%{version}-mpz_set_d.diff
 Patch6:         %{name}-%{version}-x86-fat.diff
+Patch7:         %{name}-noexec.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -64,6 +65,7 @@ Authors:
 %patch4
 %patch5
 %patch6
+%patch7
 
 %build
 export HOME=/tmp/
@@ -97,6 +99,8 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall" CC=gcc %{?jobs:-j%jobs}
 %ifnarch alpha
 make CFLAGS="$RPM_OPT_FLAGS -Wall" CC=gcc check %{?jobs:-j%jobs}
 %endif
+# do not disable "make check", FIX THE BUGS!
+make check
 
 %install
 make install DESTDIR=${RPM_BUILD_ROOT}
@@ -129,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/include/*
 
 %changelog -n gmp
+* Sat Jan 13 2007 - meissner@suse.de
+- Mark assembler code as not needing exec stack/heap by hacking
+  the m4 -> assembler wrapper script.
+- Run "make check", as mandated by our packaging guidelines.
 * Fri Oct 13 2006 - aj@suse.de
 - Fix build on x86-64.
 * Fri Oct 13 2006 - mjancar@suse.cz