diff --git a/.cvsignore b/.cvsignore
index d41f591..0efdf23 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nss-3.11.5.tar.gz
+nss-3.11.7-fbst3115-stripped.tar.gz
diff --git a/fake-kstat.h b/fake-kstat.h
new file mode 100644
index 0000000..8d7026b
--- /dev/null
+++ b/fake-kstat.h
@@ -0,0 +1,20 @@
+struct tag_kstat_t
+{
+  struct tag_kstat_t *ks_next;
+  char* ks_data;
+  PRUint32 ks_data_size;
+  int ks_ndata;
+};
+
+struct tag_kstat_ctl_t
+{
+  struct tag_kstat_t *kc_chain;
+};
+
+typedef struct tag_kstat_t kstat_t;
+typedef struct tag_kstat_ctl_t kstat_ctl_t;
+
+#define kstat_open() NULL
+#define kstat_read(a,b,c) -1
+#define kstat_close(x) -1
+
diff --git a/nss-clobber.sh b/nss-clobber.sh
deleted file mode 100755
index 7cb1512..0000000
--- a/nss-clobber.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh 
-FREEBLDIR=./mozilla/security/nss/lib/freebl
-set -e 
-
-mv ${FREEBLDIR}/ecl/ecl-exp.h ${FREEBLDIR}/save
-rm -rf ${FREEBLDIR}/ecl/tests
-rm -rf ${FREEBLDIR}/ecl/CVS
-for i in ${FREEBLDIR}/ecl/* ; do
-echo clobbering $i
- > $i
-done
-mv ${FREEBLDIR}/save ${FREEBLDIR}/ecl/ecl-exp.h
-
-for j in ${FREEBLDIR}/ec.*; do
-        echo unifdef $j
-	cat $j | \
-	awk    'BEGIN {ech=1; prt=0;} \
-		/^#[ \t]*ifdef.*NSS_ENABLE_ECC/ {ech--; next;} \
-                /^#[ \t]*if/ {if(ech < 1) ech--;} \
-		{if(ech>0) {;print $0};} \
-		/^#[ \t]*endif/ {if(ech < 1) ech++;} \
-		{if (prt && (ech<=0)) {;print $0}; } \
-		{if (ech>0) {prt=0;} } \
-                /^#[ \t]*else/ {if (ech == 0) prt=1;}' > $j.hobbled && \
-	mv $j.hobbled $j
-done
diff --git a/nss-use-netstat-hack.patch b/nss-use-netstat-hack.patch
new file mode 100644
index 0000000..7469349
--- /dev/null
+++ b/nss-use-netstat-hack.patch
@@ -0,0 +1,11 @@
+--- ./mozilla/security/coreconf/config.mk.org	2007-05-25 01:53:04.000000000 +0200
++++ ./mozilla/security/coreconf/config.mk	2007-05-25 01:52:58.000000000 +0200
+@@ -185,3 +185,8 @@
+ ifdef NSS_ALLOW_UNSUPPORTED_CRITICAL
+ DEFINES += -DNSS_ALLOW_UNSUPPORTED_CRITICAL
+ endif
++
++ifdef USE_NETSTAT_HACK
++DEFINES += -DSOLARIS
++INCLUDES += -I../fake
++endif
diff --git a/nss.spec b/nss.spec
index 1901980..f270b2e 100644
--- a/nss.spec
+++ b/nss.spec
@@ -3,7 +3,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.11.5
+Version:          3.11.7
 Release:          2%{?dist}
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -16,16 +16,17 @@ BuildRequires:    gawk
 Provides:         mozilla-nss
 Obsoletes:        mozilla-nss
 
-Source0:          %{name}-%{version}.tar.gz
+Source0:          %{name}-%{version}-fbst3115-stripped.tar.gz
 Source1:          nss.pc.in
 Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-Source6:	  nss-clobber.sh
+Source7:          fake-kstat.h
 
 Patch1:           nss-no-rpath.patch
 Patch2:           nss-smartcard-auth.patch
+Patch3:           nss-use-netstat-hack.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -75,9 +76,11 @@ low level services.
 
 %prep
 %setup -q
-sh %{SOURCE6} > /dev/null
 %patch1  -p0
 %patch2 -p0 -b .smartcard-auth.patch
+%patch3 -p0
+%{__mkdir_p} mozilla/security/nss/lib/fake/
+cp -i %{SOURCE7} mozilla/security/nss/lib/fake/kstat.h
 
 %build
 
@@ -114,6 +117,14 @@ export USE_64
 
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
+%{__make} -C ./mozilla/security/nss export
+
+%{__make} -C ./mozilla/security/nss/lib/util
+%{__make} -C ./mozilla/security/nss/lib/freebl
+
+touch ./mozilla/security/nss/lib/freebl/unix_rand.c
+USE_NETSTAT_HACK=1 %{__make} -C ./mozilla/security/nss/lib/freebl
+
 %{__make} -C ./mozilla/security/nss 
 
 # Set up our package file
@@ -355,6 +366,10 @@ done
 
 
 %changelog
+* Fri Jun 01 2007 Kai Engert <kengert@redhat.com> - 3.11.7-2
+- Update to 3.11.7, but freebl/softokn remain at 3.11.5.
+- Use a workaround to avoid mozilla bug 51429.
+
 * Fri Mar 02 2007 Kai Engert <kengert@redhat.com> - 3.11.5-2
 - Fix rhbz#230545, failure to enable FIPS mode
 - Fix rhbz#220542, make NSS more tolerant of resets when in the 
diff --git a/sources b/sources
index ceae8f3..1eb758a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1add44e6a41dbf5091cfd000f19ad6b9  nss-3.11.5.tar.gz
+d57e4dd494f04f4c26c9035e660a1fba  nss-3.11.7-fbst3115-stripped.tar.gz