diff --git a/nss-bug180726.patch b/nss-bug180726.patch
new file mode 100644
index 0000000..6462914
--- /dev/null
+++ b/nss-bug180726.patch
@@ -0,0 +1,11 @@
+--- mozilla/security/nss/lib/freebl/Makefile.fix180726	2006-02-15 07:19:21.000000000 +0100
++++ mozilla/security/nss/lib/freebl/Makefile	2006-02-15 07:19:25.000000000 +0100
+@@ -134,7 +134,7 @@
+ ifeq ($(OS_TARGET),Linux)
+ ifeq ($(CPU_ARCH),x86_64)
+     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
+-    ASFLAGS += -march=opteron -m64 -fPIC
++    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
+     DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
+     DEFINES += -DNSS_USE_COMBA
+     MPI_SRCS += mpi_amd64.c mp_comba.c
diff --git a/nss.spec b/nss.spec
index 85383b1..d442513 100644
--- a/nss.spec
+++ b/nss.spec
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11
-Release:          3.2
+Release:          4
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -20,6 +20,7 @@ Source1:          nss.pc.in
 Source2:          nss-config.in
 
 Patch1:           nss-3.11-zdefs.patch
+Patch2:           nss-bug180726.patch
 
 
 %description
@@ -71,6 +72,7 @@ low level services.
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p0
 
 %build
 
@@ -308,6 +310,9 @@ done
 
 
 %changelog
+* Wed Feb 15 2006 Kai Engert <kengert@redhat.com> - 3.11-4
+- add --noexecstack when compiling assembler on x86_64
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.11-3.2
 - bump again for double-long bug on ppc(64)