diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in
index b957d44e11b..10329b7500c 100644
--- a/mozilla/accessible/build/Makefile.in
+++ b/mozilla/accessible/build/Makefile.in
@@ -83,7 +83,6 @@ EXTRA_DSO_LIBS = \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS =           \
-	$(MOZ_FIX_LINK_PATHS)    \
 	$(LIBS_DIR)              \
 	$(EXTRA_DSO_LIBS)        \
 	$(MOZ_UNICHARUTIL_LIBS)  \
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 4ceb49022ff..f4366312a5c 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -531,7 +531,7 @@ endif
 
 CFLAGS		= $(OS_CFLAGS)
 CXXFLAGS	= $(OS_CXXFLAGS)
-LDFLAGS		= $(OS_LDFLAGS)
+LDFLAGS		= $(OS_LDFLAGS) $(MOZ_FIX_LINK_PATHS)
 
 # Allow each module to override the *default* optimization settings
 # by setting MODULE_OPTIMIZE_FLAGS if the developer has not given
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 456b763821e..31330fee7f2 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -889,7 +889,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
 MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
 DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
 MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
-XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom'
+XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
 LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
 XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
 XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
diff --git a/mozilla/gfx/src/thebes/Makefile.in b/mozilla/gfx/src/thebes/Makefile.in
index 1af0298fb1a..584a6da4891 100644
--- a/mozilla/gfx/src/thebes/Makefile.in
+++ b/mozilla/gfx/src/thebes/Makefile.in
@@ -139,7 +139,6 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
-		$(MOZ_FIX_LINK_PATHS) \
 		../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 552bd1b975f..87e950029d0 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -214,7 +214,6 @@ DEFINES += -DENABLE_EDITOR_API_LOG
 endif
 
 EXTRA_DSO_LDOPTS = \
-		$(MOZ_FIX_LINK_PATHS) \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index 8c1813e5ba4..6d17425278f 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -139,11 +139,6 @@ DEFINES += -DNSS_ENABLE_ECC
 # so that Mozilla's nss.h is used, not glibc's
 LOCAL_INCLUDES += $(NSS_CFLAGS)
 
-ifeq ($(OS_ARCH),Darwin)
-EXTRA_DSO_LDOPTS += \
-		-Wl,-executable_path -Wl,../../../../dist/bin
-endif
-
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
diff --git a/mozilla/toolkit/library/libxul-rules.mk b/mozilla/toolkit/library/libxul-rules.mk
index 1550845760e..994d46aa7a0 100644
--- a/mozilla/toolkit/library/libxul-rules.mk
+++ b/mozilla/toolkit/library/libxul-rules.mk
@@ -37,7 +37,6 @@
 # ***** END LICENSE BLOCK *****
 
 EXTRA_DSO_LDOPTS += \
-	$(MOZ_FIX_LINK_PATHS) \
 	$(LIBS_DIR) \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
diff --git a/mozilla/widget/src/cocoa/Makefile.in b/mozilla/widget/src/cocoa/Makefile.in
index 4e4752f8467..1631460c9f2 100644
--- a/mozilla/widget/src/cocoa/Makefile.in
+++ b/mozilla/widget/src/cocoa/Makefile.in
@@ -130,7 +130,6 @@ EXTRA_DSO_LDOPTS += \
 		$(call EXPAND_LIBNAME_PATH,gkgfx,$(DEPTH)/gfx/src) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lthebes \
-		$(MOZ_FIX_LINK_PATHS) \
 		$(LCMS_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/xpcom/stub/Makefile.in b/mozilla/xpcom/stub/Makefile.in
index 5ef0f31e508..e6045b23f28 100644
--- a/mozilla/xpcom/stub/Makefile.in
+++ b/mozilla/xpcom/stub/Makefile.in
@@ -80,7 +80,7 @@ FORCE_USE_PIC	= 1
 
 FORCE_SHARED_LIB = 1
 
-EXTRA_DSO_LDOPTS = $(LIBS_DIR) $(MOZ_FIX_LINK_PATHS)
+EXTRA_DSO_LDOPTS = $(LIBS_DIR)
 
 DEPENDENT_LIBS_LIST += \
 	$(LIB_PREFIX)nspr4$(DLL_SUFFIX) \