$ git diff --patch-with-stat --summary 7b9c503549a91aa457529fa10f431ae8b76a19d7..0d78a474e889cf25b75b177fbba019e0c16e7df1

 .abf.yml |  2 +-
 nss.spec | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 9236218..4d3b702 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -3,5 +3,5 @@ sources:
   blank-cert8.db: d272a7b58364862613d44261c5744f7a336bf177
   blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5
   blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50
-  nss-3.51.1.tar.gz: 08f779e74242971bb8cf96fb6b4c1fbab3d7bc4c
+  nss-3.54.tar.gz: 93ec442274efa4de56e44292e2abcb6a1b919d39
   verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5
diff --git a/nss.spec b/nss.spec
index 6e425f3..0f25e70 100644
--- a/nss.spec
+++ b/nss.spec
@@ -24,8 +24,8 @@
 Summary:	Network Security Services
 Name:		nss
 Epoch:		1
-Version:	3.51.1
-Release:	1
+Version:	3.54
+Release:	2
 Group:		System/Libraries
 License:	MPL or GPLv2+ or LGPLv2+
 Url:		http://www.mozilla.org/projects/security/pki/nss/index.html
@@ -121,9 +121,10 @@ and libsoftokn3.
 %package -n %{libname}
 Summary:	Network Security Services (NSS)
 Group:		System/Libraries
+Requires:	p11-kit-trust
 
 %description -n %{libname}
-This package contains the shared libraries libnss3, libnssckbi, libnssdbm3,
+This package contains the shared libraries libnss3, libnssdbm3,
 libnssutil3, libsmime3, and libssl3.
 
 %package -n %{libfreebl}
@@ -215,8 +216,8 @@ popd
 	# Compile tools used at build time (nsinstall) in native
 	# mode before setting up the environment for crosscompiling
 	export USE_64=1
-	make -j1 -C ./nss \
-		build_coreconf build_dbm all
+	make -j1 -C ./nss all 
+        make -j1 -C ./nss latest
 
 	CPU_ARCH="%_target_cpu"
 	if echo $CPU_ARCH |grep -qE '(i.86|pentium.|athlon)'; then
@@ -249,9 +250,8 @@ unset USE_64 || :
 #%else
 #buildflags="TARGETCC='$TARGETCC' TARGETCCC='$TARGETCCC' TARGETRANLIB='$TARGETRANLIB' AR='%__ar"
 #%endif
-%make_build -j1 -C ./nss/coreconf
-%make_build -j1 -C ./nss/lib/dbm
-%make_build -j1 -C ./nss
+%make_build -j1 -C ./nss all
+%make_build -j1 -C ./nss latest
 
 %if %{build_empty}
 # tuck away the empty libnssckbi.so library
@@ -308,7 +308,6 @@ mkdir -p %{buildroot}%{_includedir}/nss
 cp -aL lib/libcrmf.a \
             lib/libnss.a \
             lib/libnssb.a \
-            lib/libnssckbi.so \
             lib/libnssckfw.a \
             lib/libnssutil.a \
             lib/libsmime.a \
@@ -317,7 +316,7 @@ cp -aL lib/libcrmf.a \
 
 # Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libfreeblpriv3.so libnss3.so libnssutil3.so \
-            libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
+            libssl3.so libsmime3.so libnssdbm3.so
 do
   install -m 755 lib/$file %{buildroot}/%{_lib}
   ln -sf ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
@@ -337,6 +336,9 @@ for file in libfreebl.a; do
 	install -p -m 644 ../*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
+
+ln -s %{_libdir}/pkcs11/p11-kit-trust.so %{buildroot}/%{_lib}/libnssckbi.so
+
 # These ghost files will be generated in the post step
 # Make sure chk files can be found in both places
 for file in libsoftokn3.chk libfreebl3.chk
@@ -467,6 +469,11 @@ local f3 = "libfreeblpriv" .. major .. ".chk"
 end
 %endif
 
+%pretrans -n %{libname}
+if [ -f %{_libdir}/libnssckbi.so -a ! -L %{_libdir}/libnssckbi.so ]; then
+  rm -f %{_libdir}/libnssckbi.so
+fi
+
 %files
 %dir %{_sysconfdir}/pki/nssdb
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
@@ -548,6 +555,8 @@ end
 /%{_lib}/libfreebl%{major}.so
 /%{_lib}/libfreeblpriv%{major}.so
 /%{_lib}/libsoftokn%{major}.so
+/%{_lib}/libnssckbi.so
+
 %defattr(0644,root,root,0755)
 %ghost /%{_lib}/libfreebl%{major}.chk
 %ghost /%{_lib}/libsoftokn%{major}.chk
@@ -555,7 +564,6 @@ end
 
 %files -n %{libname}
 /%{_lib}/libnss%{major}.so
-/%{_lib}/libnssckbi.so
 %if %{build_empty}
 /%{_lib}/libnssckbi_empty.so
 %endif