--- config/rules.mk.orig	2005-07-28 01:45:18.000000000 +0000
+++ config/rules.mk	2005-07-28 01:45:21.000000000 +0000
@@ -507,5 +507,10 @@
 # 
 ifeq ($(OS_ARCH),Linux)
 ifdef IS_COMPONENT
+DSO_LDOPTS += -Wl,-R'/usr/lib/mozilla'
+OS_LDFLAGS += -Wl,-R'/usr/lib/mozilla'
 EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+else
+DSO_LDOPTS += -Wl,-R'/usr/lib/mozilla'
+OS_LDFLAGS += -Wl,-R'/usr/lib/mozilla'
 endif
--- nsprpub/config/rules.mk.orig	2003-09-16 02:00:28.000000000 +0000
+++ nsprpub/config/rules.mk	2005-07-30 04:00:21.000000000 +0000
@@ -87,6 +87,9 @@
 endif
 endif
 
+DSO_LDOPTS += -Wl,-R'/usr/lib/mozilla'
+OS_LDFLAGS += -Wl,-R'/usr/lib/mozilla'
+
 #
 # This makefile contains rules for building the following kinds of
 # libraries:
--- security/coreconf/rules.mk.orig	2005-07-31 16:31:37.000000000 +0000
+++ security/coreconf/rules.mk	2005-07-31 16:37:27.000000000 +0000
@@ -349,7 +349,7 @@
 ifdef XP_OS2_VACPP
 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
 else
-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+	$(MKSHLIB) -Wl,-R'/usr/lib/mozilla' -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
 endif
 	chmod +x $@
 ifeq ($(OS_TARGET),Darwin)
--- security/coreconf/rules.mk.orig	2005-08-01 11:40:54.000000000 +0000
+++ security/coreconf/rules.mk	2005-08-01 11:50:31.000000000 +0000
@@ -291,7 +291,7 @@
 ifdef XP_OS2_VACPP
 	$(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 else
-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+	$(MKPROG) -Wl,-R'/usr/lib/mozilla' -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 endif
 endif