diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index e7e8d22a2d3..af13ab4c077 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.34 2005/09/16 15:54:53 david Exp $
+# $OpenBSD: Makefile,v 1.35 2005/09/24 16:19:29 bernd Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 i386 powerpc sparc sparc64
 
 COMMENT=	"redesign of Mozilla's browser component"
 
-VER=		1.0.6
+VER=		1.0.7
 DISTNAME=	mozilla
-PKGNAME=	mozilla-firefox-${VER}p3
-SO_VERSION=	6.0
+PKGNAME=	mozilla-firefox-${VER}
+SO_VERSION=	7.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 
@@ -66,7 +66,8 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--disable-debug			\
 		--disable-tests			\
 		--disable-pedantic		\
-		--disable-installer
+		--disable-installer		\
+		--disable-gnomevfs
 
 # from browser/config/mozconfig
 CONFIGURE_ARGS+=--disable-ldap			\
@@ -121,7 +122,6 @@ do-install:
 	ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin
 
 	${INSTALL_DATA_DIR} ${MOZ}/extensions
-	${INSTALL_DATA} ${FILESDIR}/bug307259.js ${MOZ}/defaults/pref/
 	${INSTALL_DATA} ${FILESDIR}/Extensions.rdf ${MOZ}/extensions/
 	${INSTALL_DATA_DIR} ${MOZ}/extensions/${MAGIC}
 	${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/installed-extensions.txt ${MOZ}/extensions/installed-extensions-processed.txt
diff --git a/www/mozilla-firefox/distinfo b/www/mozilla-firefox/distinfo
index 72500d659d8..b11e65f284d 100644
--- a/www/mozilla-firefox/distinfo
+++ b/www/mozilla-firefox/distinfo
@@ -1,4 +1,4 @@
-MD5 (firefox-1.0.6-source.tar.bz2) = 7b4c1d10d478dcb4c52fbbe3e41745d9
-RMD160 (firefox-1.0.6-source.tar.bz2) = 8af3fa48fad539f26a5f1b57526efc85b22fca00
-SHA1 (firefox-1.0.6-source.tar.bz2) = 56183aa14a0185a27a6ab4337d2ade7d1d45c2a6
-SIZE (firefox-1.0.6-source.tar.bz2) = 32782840
+MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df
+RMD160 (firefox-1.0.7-source.tar.bz2) = 8afafa2d772cabeacde5bad6dc053f9a0ee9a588
+SHA1 (firefox-1.0.7-source.tar.bz2) = ac7549f609db8dbea6db33b2ffb3ae546eea64df
+SIZE (firefox-1.0.7-source.tar.bz2) = 32793876
diff --git a/www/mozilla-firefox/files/bug307259.js b/www/mozilla-firefox/files/bug307259.js
deleted file mode 100644
index f9cf4c9a6c0..00000000000
--- a/www/mozilla-firefox/files/bug307259.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// rev version number so the patch is not offered again (bug307259)
-pref("general.useragent.productComment", "No IDN");
-pref("network.enableIDN", false);
\ No newline at end of file
diff --git a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
index 92667467628..751398fd144 100644
--- a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
+++ b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-browser_app_mozilla_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
---- browser/app/mozilla.in.orig	Tue Oct 26 11:26:11 2004
-+++ browser/app/mozilla.in	Thu Oct 28 17:20:22 2004
+$OpenBSD: patch-browser_app_mozilla_in,v 1.3 2005/09/24 16:19:29 bernd Exp $
+--- browser/app/mozilla.in.orig	Tue Sep 20 23:10:28 2005
++++ browser/app/mozilla.in	Thu Sep 22 10:26:21 2005
 @@ -73,6 +73,7 @@ moz_pis_startstop_scripts()
  #set -x
  
@@ -9,7 +9,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
  MRE_HOME=%MREDIR%
  
  # Use run-mozilla.sh in the current dir if it exists
-@@ -214,7 +215,11 @@ do
+@@ -217,7 +218,11 @@ do
    esac
  done
  
@@ -19,6 +19,6 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
 +fi
 +
 +export MOZ_PLUGIN_PATH MRE_HOME
- eval "set -- $moreargs"
  
  ## Start addon scripts
+ moz_pis_startstop_scripts "start"
diff --git a/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp b/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp
index 94994cc0602..bdc72849607 100644
--- a/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp
+++ b/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_gtk_nsScreenGtk_cpp,v 1.1 2005/09/08 12:48:39 kurt Exp $
---- gfx/src/gtk/nsScreenGtk.cpp.orig   Thu Aug 25 18:29:50 2005
-+++ gfx/src/gtk/nsScreenGtk.cpp        Thu Aug 25 18:31:17 2005
+$OpenBSD: patch-gfx_src_gtk_nsScreenGtk_cpp,v 1.2 2005/09/24 16:19:29 bernd Exp $
+--- gfx/src/gtk/nsScreenGtk.cpp.orig	Tue Apr 20 19:35:51 2004
++++ gfx/src/gtk/nsScreenGtk.cpp	Thu Sep 22 10:16:43 2005
 @@ -143,7 +143,7 @@ nsScreenGtk :: Init ()
    if (!gdk_property_get(root_window,
                          gdk_atom_intern ("_NET_WORKAREA", FALSE),
diff --git a/www/mozilla-firefox/pkg/PLIST b/www/mozilla-firefox/pkg/PLIST
index cc1de6e63f0..33fd006a3dc 100644
--- a/www/mozilla-firefox/pkg/PLIST
+++ b/www/mozilla-firefox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2005/09/16 15:54:54 david Exp $
+@comment $OpenBSD: PLIST,v 1.13 2005/09/24 16:19:29 bernd Exp $
 @conflict mozilla-firebird-*
 %%SHARED%%
 bin/firefox
@@ -337,7 +337,6 @@ mozilla-firefox/defaults/autoconfig/
 mozilla-firefox/defaults/autoconfig/platform.js
 mozilla-firefox/defaults/autoconfig/prefcalls.js
 mozilla-firefox/defaults/pref/
-mozilla-firefox/defaults/pref/bug307259.js
 mozilla-firefox/defaults/pref/firefox-l10n.js
 mozilla-firefox/defaults/pref/firefox.js
 mozilla-firefox/defaults/pref/inspector.js