diff --git a/mozilla/nsprpub/config/Linux.mk b/mozilla/nsprpub/config/Linux.mk
index 551360574ca..daad17f5b52 100644
--- a/mozilla/nsprpub/config/Linux.mk
+++ b/mozilla/nsprpub/config/Linux.mk
@@ -115,6 +115,8 @@ endif
 MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(notdir $@)
 ifdef BUILD_OPT
 OPTIMIZER		= -O2
+#   invoke 'strip' on *.so files in optimized builds
+STRIP = strip
 endif
 
 ######################################################################
diff --git a/mozilla/nsprpub/config/UNIX.mk b/mozilla/nsprpub/config/UNIX.mk
index 34a0a0eec37..bdb72b5b44f 100644
--- a/mozilla/nsprpub/config/UNIX.mk
+++ b/mozilla/nsprpub/config/UNIX.mk
@@ -37,6 +37,7 @@ OBJ_SUFFIX	= o
 LIB_SUFFIX	= a
 DLL_SUFFIX	= so
 AR		= ar cr $@
+STRIP		= true
 
 ifdef BUILD_OPT
 OPTIMIZER	= -O
diff --git a/mozilla/nsprpub/config/autoconf.mk.in b/mozilla/nsprpub/config/autoconf.mk.in
index 83b7a86fbce..8979f32313a 100644
--- a/mozilla/nsprpub/config/autoconf.mk.in
+++ b/mozilla/nsprpub/config/autoconf.mk.in
@@ -10,6 +10,8 @@ DLL_SUFFIX	= @DLL_SUFFIX@
 MOD_VERSION	= @NSPR_VERSION@
 MOD_NAME	= @NSPR_MODNAME@
 
+BUILD_OPT	= @MOZ_OPTIMIZE@
+
 USE_CPLUS	= @USE_CPLUS@
 USE_IPV6	= @USE_IPV6@
 USE_N32		= @USE_N32@
@@ -32,6 +34,7 @@ PERL		= @PERL@
 DLLTOOL		= @DLLTOOL@
 WINDRES		= @WINDRES@
 RC		= $(WINDRES)
+STRIP		= @STRIP@
 
 OS_CFLAGS	= @CFLAGS@ $(DSO_CFLAGS)
 OS_CXXFLAGS	= @CXXFLAGS@ $(DSO_CFLAGS)
diff --git a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk
index 58283290a22..70f64b813d6 100644
--- a/mozilla/nsprpub/config/rules.mk
+++ b/mozilla/nsprpub/config/rules.mk
@@ -285,6 +285,9 @@ else
 	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS)
 endif
 endif
+ifdef BUILD_OPT
+	$(STRIP) $@
+endif
 
 $(LIBRARY): $(OBJS)
 	@$(MAKE_OBJDIR)
@@ -297,6 +300,9 @@ ifdef USE_AUTOCONF
 else
 	$(AR) $(OBJS) $(AR_EXTRA_ARGS)
 endif # USE_AUTOCONF
+endif
+ifdef BUILD_OPT
+	$(STRIP) $@
 endif
 	$(RANLIB) $@
 
@@ -371,6 +377,9 @@ endif   # OS2
 endif	# WINNT
 endif	# AIX 4.1
 endif   # USE_AUTOCONF
+ifdef BUILD_OPT
+	$(STRIP) $@
+endif
 
 
 ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
index 99a0eb43cde..5587c2f0a89 100644
--- a/mozilla/nsprpub/configure.in
+++ b/mozilla/nsprpub/configure.in
@@ -250,6 +250,7 @@ dnl ========================================================
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PATH_PROGS(PERL, perl5 perl, :)
+AC_PATH_PROGS(STRIP, strip, :)
 
 dnl ========================================================
 dnl Default platform specific options
@@ -1047,6 +1048,8 @@ AC_SUBST(HOST_CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(GNU_CC)
 
+AC_SUBST(MOZ_OPTIMIZE)
+
 AC_SUBST(USE_CPLUS)
 AC_SUBST(USE_IPV6)
 AC_SUBST(USE_N32)