diff --git a/build/package/rpm/SOURCES/mozilla.sh.in b/build/package/rpm/SOURCES/mozilla.sh.in
index 790d4fffee73..d78a3416a403 100755
--- a/build/package/rpm/SOURCES/mozilla.sh.in
+++ b/build/package/rpm/SOURCES/mozilla.sh.in
@@ -57,7 +57,13 @@ export LD_LIBRARY_PATH
 ##
 ## Make sure that we set the plugin path for backwards compatibility
 ##
-MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins
+if [ "$MOZ_PLUGIN_PATH" ]
+then
+  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:/usr/lib/mozilla/plugins:LIBDIR/mozilla/plugins
+else
+  MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:LIBDIR/mozilla/plugins
+fi
+
 export MOZ_PLUGIN_PATH
 
 function check_running() {
diff --git a/build/package/rpm/SPECS/mozilla-DATE.spec.in b/build/package/rpm/SPECS/mozilla-DATE.spec.in
index 17a4ea4632a0..b4c3f9c62b6f 100644
--- a/build/package/rpm/SPECS/mozilla-DATE.spec.in
+++ b/build/package/rpm/SPECS/mozilla-DATE.spec.in
@@ -28,13 +28,11 @@ Patch0:      mozilla-navigator-overlay-menu.patch
 Patch1:      mozilla-editor-overlay-menu.patch
 Patch6:      mozilla-prefs-debug.patch
 Patch7:      mozilla-redhat-home-page.patch
-Patch8:      mozilla-redhat-mail-home-page.patch
 Patch12:     mozilla-psfonts-7.2.patch
 Patch13:     mozilla-nspr-packages.patch
 Patch14:     mozilla-default-plugin-less-annoying.patch
 Patch17:     mozilla-buildid-title.patch
 Patch18:     mozilla-1.2.1-uifont.patch
-Patch20:     mozilla-1.2.1-xft-font-prefs.patch
 
 Buildroot:   /var/tmp/mozilla-root
 Prefix:      /usr
@@ -159,9 +157,6 @@ development or web page development.
 %patch7 -p1
 %patch7 -p1 -R
 
-%patch8 -p1
-%patch8 -p1 -R
-
 # Can't hurt to leave this in since the defaults are empty.
 %patch12 -p1
 
@@ -178,10 +173,6 @@ development or web page development.
 # make it possible to set the uifont
 %patch18 -p1
 
-# patch to make it possible to use the font prefs with xft in a sane
-# manner
-%patch20 -p1
-
 # set up our default bookmarks
 /bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html