diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index b4ffaf73d19f..72159f8a83e5 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayerplug-in
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	2.11
 CATEGORIES=	www multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mplayerplug-in
@@ -15,34 +14,70 @@ MASTER_SITE_SUBDIR=	mplayerplug-in
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	A Mozilla plugin for the MPlayer media player
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
+		${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+
+HEADERS_SUFX=
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+PLUGINSFILES=	mplayerplug-in.so mplayerplug-in.xpt
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 
+.if !defined(WITH_MOZILLA)
+HEADERS_SUFX=	-gtk2
+.else
+.if ${WITH_MOZILLA}=="mozilla"
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel"
+HEADERS_SUFX=	-devel
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel-gtk"
+HEADERS_SUFX=	-devel-gtk2
+.else
+HEADERS_SUFX=	-gtk2
+.endif
+.endif
+.endif
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " By default this port uses www/mozilla-gtk2 for Gecko support, but you can"
+	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} " mozilla "
+	@${ECHO_MSG} " mozilla-devel "
+	@${ECHO_MSG} " mozilla-devel-gtk2 "
+	@${ECHO_MSG} ""
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/Source/mplayerplug-in.c
+		${WRKSRC}/Source/plugin-setup.cpp
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/mplayerplug-in.so \
-		${PREFIX}/lib/browser_plugins
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \
+	@${MKDIR} ${PREFIX}/lib/browser_plugins
+.for moo in ${PLUGINSFILES}
+	@${INSTALL_DATA} ${WRKSRC}/${moo} ${PREFIX}/lib/browser_plugins/
+.endfor
+	@${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \
 		${PREFIX}/etc/mplayerplug-in.conf.dist
 	if [ ! -f ${PREFIX}/etc/mplayerplug-in.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \
 			${PREFIX}/etc/mplayerplug-in.conf ; \
 	fi
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \
+	@${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \
 		${PREFIX}/etc/mplayerplug-in.types.dist
 	if [ ! -f ${PREFIX}/etc/mplayerplug-in.types ]; then \
 		${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \
diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo
index ca4ff2f45c22..ef1e83d96b42 100644
--- a/www/mplayer-plugin/distinfo
+++ b/www/mplayer-plugin/distinfo
@@ -1 +1,2 @@
-MD5 (mplayerplug-in-1.2.tar.gz) = 76e76136aa11613ce6fb37e52ea1a98e
+MD5 (mplayerplug-in-2.11.tar.gz) = 23d09660c0a0135079120470f8121bea
+SIZE (mplayerplug-in-2.11.tar.gz) = 125472
diff --git a/www/mplayer-plugin/files/patch-Makefile.in b/www/mplayer-plugin/files/patch-Makefile.in
index 543c2a347932..a52cce9ac9d0 100644
--- a/www/mplayer-plugin/files/patch-Makefile.in
+++ b/www/mplayer-plugin/files/patch-Makefile.in
@@ -1,20 +1,20 @@
---- Makefile.in.orig	Mon Jan 12 16:51:32 2004
-+++ Makefile.in	Sat Jan 17 02:36:27 2004
-@@ -14,7 +14,7 @@
+--- Makefile.in.orig	Sat Feb 14 13:26:10 2004
++++ Makefile.in	Sat Feb 14 13:27:03 2004
+@@ -12,7 +12,7 @@
  
  CC= @CC@
- OPTIMIZER= -g
--CFLAGS= @CFLAGS@ -DXP_UNIX -Iinclude -fPIC @X_CFLAGS@
-+CFLAGS= @CFLAGS@ @CPPFLAGS@ -DXP_UNIX -Iinclude -fPIC @X_CFLAGS@
- LDFLAGS= @LIBS@ @X_LIBS@
+ CXX= @CXX@
+-CFLAGS= -Wall @CFLAGS@ -DXP_UNIX -DMOZ_X11 @MOZPLUG_CFLAGS@ -Iinclude -fPIC @X_CFLAGS@ @GECKO_DEFINES@
++CFLAGS= -Wall @CFLAGS@ @CPPFLAGS@ -DXP_UNIX -DMOZ_X11 @MOZPLUG_CFLAGS@ -Iinclude -fPIC @X_CFLAGS@ @GECKO_DEFINES@
+ LDFLAGS= @LIBS@ @X_LIBS@ @MOZPLUG_LIBS@
  LIBOBJS= @LIBOBJS@
- OBJ= mplayerplug-in.o support.o stubs.o ui.o $(LIBOBJS)
-@@ -27,7 +27,7 @@
+ OBJ= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
+@@ -33,7 +33,7 @@
  default all: $(SHAREDTARGET)
  
  $(SHAREDTARGET): $(OBJ)
--	$(CC) -shared -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
-+	$(CC) -shared -lXt -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) @LDFLAGS@
+-	$(CXX) -shared -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
++	$(CXX) -shared -lXt -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) @LDFLAGS@
+ 	cp Source/nsIScriptableMplayerPlugin.xpt mplayerplug-in.xpt
  
- mplayerplug-in.o: Source/mplayerplug-in.c $(HEADERS) 
- 	$(CC) -c $(CFLAGS) Source/mplayerplug-in.c
+ np_entry.o: plugingate/np_entry.cpp
diff --git a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c b/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
deleted file mode 100644
index 2a6cf664938e..000000000000
--- a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- Source/mplayerplug-in.c.orig	Fri Oct  3 07:54:52 2003
-+++ Source/mplayerplug-in.c	Sun Oct  5 00:02:12 2003
-@@ -71,7 +71,7 @@
-     }
- 
-     if (config == NULL) {
--	config = fopen("/etc/mplayerplug-in.conf", "r");
-+	config = fopen("%%PREFIX%%/etc/mplayerplug-in.conf", "r");
-     }
- 
-     if (config == NULL) {
-@@ -148,7 +148,7 @@
- 	}
- 
- 	if (customtypes == NULL) {
--	    customtypes = fopen("/etc/mplayerplug-in.types", "r");
-+	    customtypes = fopen("%%PREFIX%%/etc/mplayerplug-in.types", "r");
- 	}
- 
- 	if (customtypes != NULL) {
diff --git a/www/mplayer-plugin/files/patch-Source_plugin-setup.cpp b/www/mplayer-plugin/files/patch-Source_plugin-setup.cpp
new file mode 100644
index 000000000000..4f1dfe02683c
--- /dev/null
+++ b/www/mplayer-plugin/files/patch-Source_plugin-setup.cpp
@@ -0,0 +1,38 @@
+--- Source/plugin-setup.cpp.orig	Fri Feb 13 09:45:47 2004
++++ Source/plugin-setup.cpp	Sun Feb 15 01:02:21 2004
+@@ -2,7 +2,7 @@
+ 
+ #ifndef STATICDECLS
+ #define STATICDECLS
+-int DEBUG = 1;
++int DEBUG = 0;
+ int DESTROYED = 0;
+ int enable_real;
+ int enable_qt;
+@@ -76,7 +76,7 @@
+     }
+ 
+     if (config == NULL) {
+-	config = fopen("/etc/mplayerplug-in.conf", "r");
++	config = fopen("/usr/X11R6/etc/mplayerplug-in.conf", "r");
+     }
+ 
+     if (config == NULL) {
+@@ -153,7 +153,7 @@
+ 	}
+ 
+ 	if (customtypes == NULL) {
+-	    customtypes = fopen("/etc/mplayerplug-in.types", "r");
++	    customtypes = fopen("/usr/X11R6/etc/mplayerplug-in.types", "r");
+ 	}
+ 
+ 	if (customtypes != NULL) {
+@@ -439,7 +439,7 @@
+     }
+ 
+     if (config == NULL) {
+-	config = fopen("/etc/mplayerplug-in.conf", "r");
++	config = fopen("/usr/X11R6/etc/mplayerplug-in.conf", "r");
+     }
+ 
+     if (config == NULL) {
diff --git a/www/mplayer-plugin/files/patch-Source_plugin.h b/www/mplayer-plugin/files/patch-Source_plugin.h
new file mode 100644
index 000000000000..11c0d7ccb513
--- /dev/null
+++ b/www/mplayer-plugin/files/patch-Source_plugin.h
@@ -0,0 +1,15 @@
+--- Source/plugin.h.orig	Sat Feb 14 08:00:01 2004
++++ Source/plugin.h	Sat Feb 14 14:53:55 2004
+@@ -37,11 +37,8 @@
+ 
+ #ifndef __PLUGIN_H__
+ #define __PLUGIN_H__
++#include <cmath>
+ #define _XOPEN_SOURCE 500
+-
+-#ifndef _GNU_SOURCE
+-#define _GNU_SOURCE
+-#endif
+ 
+ #include "pluginbase.h"
+ #include "nsScriptablePeer.h"
diff --git a/www/mplayer-plugin/files/patch-configure b/www/mplayer-plugin/files/patch-configure
deleted file mode 100644
index 2b7f0fa2f014..000000000000
--- a/www/mplayer-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Jan 17 02:41:52 2004
-+++ configure	Sat Jan 17 02:44:10 2004
-@@ -4909,7 +4909,7 @@
- 
- 
- if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
--  LIBOBJS="$LIBOBJS lstat.$ac_objext"
-+  LIBOBJS="$LIBOBJS"
- fi
- 
- echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index ba6487c1312c..8c151de6cbfe 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -3,4 +3,5 @@ etc/mplayerplug-in.conf.dist
 @unexec if cmp -s %D/etc/mplayerplug-in.types %D/etc/mplayerplug-in.types.dist; then rm -f %D/etc/mplayerplug-in.types; fi
 etc/mplayerplug-in.types.dist
 lib/browser_plugins/mplayerplug-in.so
+lib/browser_plugins/mplayerplug-in.xpt
 @unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true