diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index e4a8b3b3cf4..0dd093c235a 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.124 2009/09/10 21:28:25 martynas Exp $
+# $OpenBSD: Makefile,v 1.125 2009/09/10 21:34:55 martynas Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
@@ -7,7 +7,7 @@ COMMENT=	redesign of Mozilla's browser component
 
 VER=		3.0.14
 DISTNAME=	mozilla
-PKGNAME=	mozilla-firefox-${VER}
+PKGNAME=	mozilla-firefox-${VER}p0
 SO_VERSION=	20.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
@@ -93,6 +93,7 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--enable-system-sqlite		\
 		--enable-canvas			\
 		--disable-libxul		\
+		--disable-crashreporter		\
 		--enable-official-branding
 
 # from browser/config/mozconfig
diff --git a/www/mozilla-firefox/patches/patch-xpcom_io_SpecialSystemDirectory_cpp b/www/mozilla-firefox/patches/patch-xpcom_io_SpecialSystemDirectory_cpp
new file mode 100644
index 00000000000..a42ddcbf7f8
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-xpcom_io_SpecialSystemDirectory_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.1 2009/09/10 21:34:55 martynas Exp $
+--- xpcom/io/SpecialSystemDirectory.cpp.orig	Fri Mar 14 20:34:21 2008
++++ xpcom/io/SpecialSystemDirectory.cpp	Wed Sep  9 22:46:39 2009
+@@ -444,7 +444,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
+     if (NS_FAILED(rv))
+         return rv;
+     if (!exists) {
+-        rv = file->Create(nsIFile::DIRECTORY_TYPE, 0755);
++        rv = file->Create(nsIFile::DIRECTORY_TYPE, 0700);
+         if (NS_FAILED(rv))
+             return rv;
+     }