diff --git a/firefox.sh.in b/firefox.sh.in
index 3795280..e51a1e5 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -53,20 +53,9 @@ MOZILLA_FIVE_HOME="$MOZ_DIST_BIN"
 
 export MOZILLA_FIVE_HOME
 
-##
-## Set LD_LIBRARY_PATH
-##
-if [ "$LD_LIBRARY_PATH" ]
-then
-  LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins:$LD_LIBRARY_PATH
-else
-  LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins
-fi
-
-export LD_LIBRARY_PATH
 
 ##
-## Make sure that we set the plugin path for backwards compatibility
+## Make sure that we set the plugin path
 ##
 if [ "$MOZ_PLUGIN_PATH" ]
 then
diff --git a/firefox.spec b/firefox.spec
index e315f5c..e695e5f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -166,7 +166,7 @@ export LIBDIR='%{_libdir}'
 %define moz_make_flags %{?_smp_mflags}
 %endif
 
-MAKE="gmake %{moz_make_flags}" make -f client.mk build
+LDFLAGS="-Wl,-rpath,%{ffdir}" MAKE="gmake %{moz_make_flags}" make -f client.mk build
 
 #---------------------------------------------------------------------
 
@@ -356,7 +356,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Aug 28 2006 Behdad Esfahbod <besfahbo@redhat.com> 1.5.0.6-9
+* Tue Aug 29 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.6-9
+- Build with -rpath (#161958)
+
+* Mon Aug 28 2006 Behdad Esfahbod <besfahbo@redhat.com> 
 - Remove "Pango breaks MathML" from firefox.sh.in
 
 * Mon Aug 28 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.6-8