diff --git a/devel/xulrunner/1.9/Makefile b/devel/xulrunner/1.9/Makefile
index aa65e5abcde..e520458b14c 100644
--- a/devel/xulrunner/1.9/Makefile
+++ b/devel/xulrunner/1.9/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2010/07/15 19:28:46 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2010/07/19 13:46:27 landry Exp $
 
 ONLY_FOR_ARCHS=		alpha amd64 arm i386 powerpc sparc sparc64
 
 VERSION=		1.9.2.6
-REVISION-main=		0
+REVISION-main=		1
 REVISION-devel=		3
 DIRECTORY=		xulrunner1.9
 # needed for mozilla.port.mk
diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index 96acd345cb5..713078375f7 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.142 2010/07/09 15:43:54 landry Exp $
+# $OpenBSD: Makefile,v 1.143 2010/07/19 13:46:27 landry Exp $
 
 COMMENT =	Mozilla web browser
 
@@ -8,7 +8,7 @@ MOZILLA_BRANCH =	1.9.2
 MOZILLA_PROJECT =	mozilla-firefox
 MOZILLA_CODENAME =	browser
 
-PKGNAME =	${MOZILLA_PROJECT}-${MOZILLA_VERSION}p0
+REVISION =	1
 SO_VERSION =	22.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
diff --git a/www/mozilla-firefox/patches/patch-config_rules_mk b/www/mozilla-firefox/patches/patch-config_rules_mk
index a0cb8e531cc..29f04786f60 100644
--- a/www/mozilla-firefox/patches/patch-config_rules_mk
+++ b/www/mozilla-firefox/patches/patch-config_rules_mk
@@ -1,7 +1,9 @@
-$OpenBSD: patch-config_rules_mk,v 1.7 2010/04/26 19:55:58 landry Exp $
---- config/rules.mk.orig	Wed Jan  6 05:35:11 2010
-+++ config/rules.mk	Sun Jan 10 17:47:23 2010
-@@ -606,6 +606,12 @@ endif
+$OpenBSD: patch-config_rules_mk,v 1.8 2010/07/19 13:46:27 landry Exp $
+Add -rpath $(installdir) to be sure libxul/libxpcom can open their
+depending libs when being dlopen()'ed themselves
+--- config/rules.mk.orig	Sat Jun 26 07:27:42 2010
++++ config/rules.mk	Thu Jul 15 23:17:14 2010
+@@ -606,6 +606,14 @@ endif
  endif
  endif
  
@@ -9,6 +11,8 @@ $OpenBSD: patch-config_rules_mk,v 1.7 2010/04/26 19:55:58 landry Exp $
 +ifdef IS_COMPONENT
 +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
 +endif
++DSO_LDOPTS += -Wl,-rpath,'$(installdir)'
++OS_LDFLAGS += -Wl,-rpath,'$(installdir)'
 +endif
 +
  ifeq ($(OS_ARCH),Linux)