diff --git a/nss-config.in b/nss-config.in
index 856a812..f8f893e 100644
--- a/nss-config.in
+++ b/nss-config.in
@@ -20,6 +20,7 @@ Options:
 	[--cflags]
 Dynamic Libraries:
 	nss
+	nssutil
 	ssl
 	smime
 EOF
@@ -33,6 +34,7 @@ fi
 lib_ssl=yes
 lib_smime=yes
 lib_nss=yes
+lib_nssutil=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -83,6 +85,9 @@ while test $# -gt 0; do
     nss)
       lib_nss=yes
       ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -122,7 +127,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,$libdir -L$libdir"
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
       if test -n "$lib_ssl"; then
 	libdirs="$libdirs -lssl${major_version}"
       fi
@@ -132,6 +137,9 @@ if test "$echo_libs" = "yes"; then
       if test -n "$lib_nss"; then
 	libdirs="$libdirs -lnss${major_version}"
       fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
       echo $libdirs
 fi      
 
diff --git a/nss.spec b/nss.spec
index 4dccb1d..05f8d4f 100644
--- a/nss.spec
+++ b/nss.spec
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -447,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Thu Sep 10 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-8
+- Restoring nssutil and -rpath-link to nss-config for now - 522477
+
 * Tue Sep 08 2009 Elio Maldonado<emaldona@redhat.com - 3.12.4-7
 - Add the nss-sysinit subpackage