diff --git a/nss.spec b/nss.spec
index 8ffe684..de91aee 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,26 +1,25 @@
 %global nspr_version 4.8.9
 %global nss_util_version 3.13.1
-%global nss_softokn_version 3.13.1
 %global nss_softokn_fips_version 3.12.9
+%global nss_softokn_version 3.13.1
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.13.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
-# TODO: change from nss_softokn_fips_version back to nss_softokn_version
-# once we are done with the merge
+# TODO: revert to same version as nss once we are done with the merge
 Requires:         nss-softokn%{_isa} >= %{nss_softokn_fips_version}
 Requires:         nss-system-init
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-# TODO: change from nss_softokn_fips_version back to nss_softokn_version
-# once we are done with the merge
+# TODO: revert to same version as nss once we are done with the merge
+# Using '>=' but on RHEL the requires should be '='
 BuildRequires:    nss-softokn-devel >= %{nss_softokn_fips_version}
 BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
@@ -65,9 +64,8 @@ Patch20:          nsspem-createobject-initialize-pointer.patch
 Patch21:          0001-libnsspem-rhbz-734760.patch
 Patch22:          nsspem-init-inform-not-thread-safe.patch
 Patch23:          nss-ckbi-1.88.rtm.patch
-# this patch has been applied in nss-util where
-# it belongs, will remove from here eventually
-# Patch24:          gnuc-minor-def-fix.patch
+# Remove this patch which belongs in nss-util
+#Patch24:          gnuc-minor-def-fix.patch
 
 
 %description
@@ -114,7 +112,7 @@ Group:            Development/Libraries
 Provides:         nss-static = %{version}-%{release}
 Requires:         nss = %{version}-%{release}
 Requires:         nss-util-devel
-Requires:         nss-softokn-devel 
+Requires:         nss-softokn-devel
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
 
@@ -128,7 +126,8 @@ Group:            Development/Libraries
 Provides:         nss-pkcs11-devel-static = %{version}-%{release}
 Requires:         nss-devel = %{version}-%{release}
 # TODO: revert to using nss_softokn_version once we are done with
-# merging Rawhide into to the next RHEL version
+# the merge into to new rhel git repo
+# For RHEL we should have '=' instead of '>='
 Requires:         nss-softokn-freebl-devel >= %{nss_softokn_fips_version}
 
 %description pkcs11-devel
@@ -144,13 +143,14 @@ low level services.
 %patch3 -p0 -b .transitional
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .642433
-%patch8 -p1 -b .695011          
+%patch8 -p1 -b .695011
 %patch16 -p0 -b .539183
 %patch18 -p0 -b .646045
 %patch20 -p1 -b .717338
 %patch21 -p1 -b .734760
 %patch22 -p0 -b .736410
 %patch23 -p0 -b .ckbi188
+# TODO: Reemove this patch which is now in nss-util
 #%patch24 -p1 -b .gnuc-minor
 
 
@@ -562,6 +562,12 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Fri Dec 02 2011 Elio Maldonado Batiz <emaldona@redhat.com> - 3.13.1-4
+- Rebuild with nss-softokn from 3.12 in the buildroot
+- Allows the pem module to statically link against 3.12.x freebl
+- Required for using nss-3.13.x with nss-softokn-3.12.y for a merge inrto rhel git repo
+- Build will be temprarily placed on buildroot override but not pushed in bodhi
+
 * Fri Nov 04 2011 Elio Maldonado <emaldona@redhat.com> - 3.13.1-2
 - Fix broken dependencies by updating the nss-util and nss-softokn versions