diff --git a/firefox/PLIST b/firefox/PLIST
index 23cba4f46c..03f11f11fb 100644
--- a/firefox/PLIST
+++ b/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/19 22:25:13 tnn2 Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/24 20:59:14 htepper Exp $
 bin/firefox35
 include/firefox35/stable/base64.h
 include/firefox35/stable/blapit.h
@@ -44,7 +44,7 @@ include/firefox35/stable/md/_irix64.cfg
 include/firefox35/stable/md/_linux.cfg
 include/firefox35/stable/md/_ncr.cfg
 include/firefox35/stable/md/_nec.cfg
-include/firefox35/stable/md/_${LOWER_OPSYS}.cfg
+include/firefox35/stable/md/_netbsd.cfg
 include/firefox35/stable/md/_nextstep.cfg
 include/firefox35/stable/md/_nto.cfg
 include/firefox35/stable/md/_openbsd.cfg
diff --git a/firefox/distinfo b/firefox/distinfo
index 187b5f38dd..4a03d5ce06 100644
--- a/firefox/distinfo
+++ b/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2009/06/19 07:41:26 tnn2 Exp $
+$NetBSD: distinfo,v 1.17 2009/06/24 20:59:15 htepper Exp $
 
 SHA1 (firefox-3.5rc1-source.tar.bz2) = 12ec8dacace216b3d95e9143cfae3ab92f70166e
 RMD160 (firefox-3.5rc1-source.tar.bz2) = 1ef85ad5cb25d49c1f741ead7912a0e4d118ff63
@@ -42,8 +42,10 @@ SHA1 (patch-em) = 6b8b470fc78a4a56400e77af1057b9266634dcc9
 SHA1 (patch-en) = 39926ce5669119c358e8600e2d70d08236e67443
 SHA1 (patch-eo) = c0094cd5c796a7ebebd60d17ee8901b7ed53977d
 SHA1 (patch-we) = 5b8c6de8981c8666c3ce92d743f8d888ec8114e1
-SHA1 (patch-wf) = 6fcb3148aadd1563464dc85910d55b59ce0efcf0
-SHA1 (patch-wg) = 2ba2b23f598e18213c7478f7eb5feea3f1c70f28
-SHA1 (patch-wh) = eb20241ae91cebfb8e81039a4d0fd5d1fccd6dfd
+SHA1 (patch-wf) = 828bad0cc55b262871ea6ad230366193b7034b98
+SHA1 (patch-wg) = ceb8c4c144c0f9e18fca3ff9988c1ecc78677521
+SHA1 (patch-wh) = 9dc499dae162f0557dc11abbe9a86bbe4e463dc4
 SHA1 (patch-wi) = c218fe4b9a307c897da8890d476854820f622a1d
-SHA1 (patch-wj) = 4b59c7966a9abf0c46497cf4960e6a971d507434
+SHA1 (patch-wj) = 5f4f7b59692309edc25f2a8403e3e67134a6e1aa
+SHA1 (patch-wk) = 44aef0ae1cc690396c41d6cb2969b0bd32b492db
+SHA1 (patch-wl) = cb6d81b7f206ddf4f8a09001a3f59e53cb0460a5
diff --git a/firefox/patches/patch-wf b/firefox/patches/patch-wf
index 9a31ca13ee..984e3a43f0 100644
--- a/firefox/patches/patch-wf
+++ b/firefox/patches/patch-wf
@@ -1,4 +1,4 @@
-$NetBSD: patch-wf,v 1.1.1.1 2009/06/18 13:52:35 tnn2 Exp $
+$NetBSD: patch-wf,v 1.2 2009/06/24 20:59:15 htepper Exp $
 
 --- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-06-16 00:42:52.000000000 +0200
 +++ media/liboggz/include/oggz/oggz_off_t_generated.h
@@ -7,7 +7,7 @@ $NetBSD: patch-wf,v 1.1.1.1 2009/06/18 13:52:35 tnn2 Exp $
  #include <sys/types.h>
  
 -#if defined(__APPLE__) || defined(SOLARIS)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(__NetBSD__)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(__NetBSD__) || defined(__DragonFly__)
  typedef off_t oggz_off_t;
  #else
  typedef loff_t oggz_off_t;
diff --git a/firefox/patches/patch-wg b/firefox/patches/patch-wg
index 004554e7c6..cac0ced837 100644
--- a/firefox/patches/patch-wg
+++ b/firefox/patches/patch-wg
@@ -1,4 +1,4 @@
-$NetBSD: patch-wg,v 1.1.1.1 2009/06/18 13:52:35 tnn2 Exp $
+$NetBSD: patch-wg,v 1.2 2009/06/24 20:59:15 htepper Exp $
 
 --- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-06-16 00:42:52.000000000 +0200
 +++ media/liboggplay/src/liboggplay/std_semaphore.h
@@ -7,7 +7,7 @@ $NetBSD: patch-wg,v 1.1.1.1 2009/06/18 13:52:35 tnn2 Exp $
   */
  
 -#if defined(linux) || defined(SOLARIS)
-+#if defined(linux) || defined(SOLARIS) || defined(__NetBSD__)
++#if defined(linux) || defined(SOLARIS) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <semaphore.h>
  #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
  #define SEM_SIGNAL(p)   sem_post(&(p))
diff --git a/firefox/patches/patch-wh b/firefox/patches/patch-wh
index 693f899e24..e03cb7560c 100644
--- a/firefox/patches/patch-wh
+++ b/firefox/patches/patch-wh
@@ -1,8 +1,8 @@
-$NetBSD: patch-wh,v 1.1.1.1 2009/06/18 13:52:35 tnn2 Exp $
+$NetBSD: patch-wh,v 1.2 2009/06/24 20:59:15 htepper Exp $
 
---- media/libsydneyaudio/src/Makefile.in.orig	2009-06-16 00:42:52.000000000 +0200
+--- media/libsydneyaudio/src/Makefile.in.orig
 +++ media/libsydneyaudio/src/Makefile.in
-@@ -65,7 +65,7 @@ CSRCS		= \
+@@ -65,12 +65,18 @@ CSRCS		= \
  OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
  endif
  
@@ -11,3 +11,14 @@ $NetBSD: patch-wh,v 1.1.1.1 2009/06/18 13:52:35 tnn2 Exp $
  CSRCS		= \
  		sydney_audio_sunaudio.c \
  		$(NULL)
+ endif
+ 
++ifeq ($(OS_ARCH),DragonFly)
++CSRCS		= \
++		sydney_audio_oss.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += winmm.lib
+ endif
diff --git a/firefox/patches/patch-wj b/firefox/patches/patch-wj
index 5264a5705e..f3900452c7 100644
--- a/firefox/patches/patch-wj
+++ b/firefox/patches/patch-wj
@@ -1,13 +1,31 @@
-$NetBSD: patch-wj,v 1.1 2009/06/19 07:41:26 tnn2 Exp $
+$NetBSD: patch-wj,v 1.2 2009/06/24 20:59:15 htepper Exp $
 
---- js/src/configure.in.orig	2009-06-16 00:42:43.000000000 +0200
-+++ js/src/configure.in
+--- js/src/configure.in.orig	2009-06-16 01:42:43 +0300
++++ js/src/configure.in	2009-06-23 08:05:07 +0300
+@@ -1693,7 +1693,7 @@ case "$target" in
+     fi
+     ;;
+ 
+-*-freebsd*)
++*-freebsd*|*-dragonfly*)
+     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
+ 	DLL_SUFFIX=".so.1.0"
+ 	DSO_LDOPTS="-shared"
 @@ -2504,7 +2504,7 @@ darwin*)
  solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
 -freebsd*|kfreebsd*)
-+freebsd*|kfreebsd*|netbsd*)
++freebsd*|kfreebsd*|netbsd*|dragonfly*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
  *cygwin*|*mingw*|*mks*|*msvc*|*wince)
+@@ -4185,7 +4185,7 @@ if test "$MOZ_MEMORY"; then
+   darwin*)
+     AC_DEFINE(MOZ_MEMORY_DARWIN)
+     ;;
+-  *freebsd*)
++  *freebsd*|dragonfly*)
+     AC_DEFINE(MOZ_MEMORY_BSD)
+     ;;
+   *linux*)
diff --git a/firefox/patches/patch-wk b/firefox/patches/patch-wk
new file mode 100644
index 0000000000..d93e90464c
--- /dev/null
+++ b/firefox/patches/patch-wk
@@ -0,0 +1,13 @@
+$NetBSD: patch-wk,v 1.1 2009/06/24 20:59:15 htepper Exp $
+
+--- gfx/qcms/qcmstypes.h.orig	2009-06-23 09:01:23 +0300
++++ gfx/qcms/qcmstypes.h	2009-06-23 09:01:54 +0300
+@@ -23,7 +23,7 @@ typedef PRUint64 uint64_t;
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
+ #else
+ typedef PRUptrdiff uintptr_t;
diff --git a/firefox/patches/patch-wl b/firefox/patches/patch-wl
new file mode 100644
index 0000000000..db051e79f1
--- /dev/null
+++ b/firefox/patches/patch-wl
@@ -0,0 +1,26 @@
+$NetBSD: patch-wl,v 1.1 2009/06/24 20:59:15 htepper Exp $
+
+SOUND_VERSION just isn't a reliable way to detect features supported by
+particular OSS implementation.
+
+--- media/libsydneyaudio/src/sydney_audio_oss.c.orig
++++ media/libsydneyaudio/src/sydney_audio_oss.c
+@@ -51,9 +51,9 @@
+ // support only versions newer than 3.6.1
+ #define SUPP_OSS_VERSION OSS_VERSION(3,6,1)
+ 
+-#if (SOUND_VERSION < SUPP_OSS_VERSION)
+-#error Unsupported OSS Version
+-#else
++//#if (SOUND_VERSION < SUPP_OSS_VERSION)
++//#error Unsupported OSS Version
++//#else
+ 
+ typedef struct sa_buf sa_buf;
+ struct sa_buf {
+@@ -716,4 +716,4 @@ UNSUPPORTED(int sa_stream_drain(sa_strea
+ 
+ const char *sa_strerror(int code) { return NULL; }
+ 
+-#endif
++//#endif