diff --git a/nspr.spec b/nspr.spec
index 763d8ca..141faef 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.1
-Release:	1
+Release:	2
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -9,6 +9,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Source0:	%{name}-%{version}.tar.gz
 Source1:	nspr.pc.in
 
+Patch1:         nspr-4.6.1-gcc-visibility.patch
+
 Provides:	mozilla-nspr
 Obsoletes:	mozilla-nspr
 
@@ -33,6 +35,7 @@ Header files for doing development with the Netscape Portable Runtime.
 %setup -q
 
 # patches
+%patch1 -p0
 
 %build
 
@@ -76,6 +79,9 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
 %{__rm} -rf \
    $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
    $RPM_BUILD_ROOT/%{_bindir}/prerr.properties \
+   $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \
+   $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \
+   $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \
    $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
 
@@ -100,14 +106,14 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
 %{_libdir}/pkgconfig/nspr.pc
 %{_bindir}/nspr-config
 
-# Static libs are temporarily shipped since nss currently needs
-# them to build (and all things depending on nss, e.g. firefox)
-# They will not be included in a future revision.
-%{_libdir}/libnspr4.a
-%{_libdir}/libplc4.a
-%{_libdir}/libplds4.a
-
 %changelog
+* Wed Jan  4 2006 Kai Engert <kengert@redhat.com>
+- Add an upstream patch to fix gcc visibility issues.
+
+* Tue Jan  3 2006 Christopher Aillon <caillon@redhat.com>
+- Stop shipping static libraries; NSS and dependencies no longer
+  require static libraries to build.
+
 * Thu Dec 15 2005 Christopher Aillon <caillon@redhat.com> 4.6.1-1
 - Update to 4.6.1