diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 9153564a211d..166ef65997bd 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	mupen64plus-base
+# New ports collection makefile for:	mupen64plus-core
 # Date created:		2008-05-16
 # Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 #
@@ -6,52 +6,27 @@
 #
 
 PORTNAME=	mupen64plus
-PORTVERSION?=	1.5
-PORTREVISION?=	4
+PORTVERSION?=	1.99.4
+PORTREVISION?=	0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-PKGNAMESUFFIX?=	-base
+PKGNAMESUFFIX?=	-core
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	A fork of Mupen64 Nintendo 64 emulator
 
-USE_GNOME?=	pkgconfig gtk20
-USE_GL?=	#
+USE_GL?=	yes
 USE_SDL?=	#
 USE_GMAKE=	yes
+USE_LDCONFIG?=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 
-FIXFILES?=	r4300/r4300.c r4300/recomp.c memory/dma.c r4300/x86/assemble.c \
-		r4300/x86_64/assemble.c main/gui_gtk/main_gtk.c
-
-OPTIONS?=	NOGUI	"Build without GUI support"	off \
-		GTK2	"Build GTK2 GUI support" on	\
-		QT4	"Build QT4 GUI support" off
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NOGUI)
-.	if defined(WITH_GTK2) || defined(WITH_QT4)
-IGNORE=	only one option must be selected, try make config again
-.	endif
-.endif
-
-.if defined(WITH_GTK2)
-.       if defined(WITH_NOGUI) || defined(WITH_QT4)
-IGNORE=	only one option must be selected, try make config again
-.       endif
-.endif
-
-.if defined(WITH_QT4)
-.       if defined(WITH_NOGUI) || defined(WITH_GTK2)
-IGNORE=	only one option must be selected, try make config again
-.       endif
-.endif
-
 .include "${MASTERDIR}/Makefile.common"
 
 .include <bsd.port.post.mk>
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 3f0b8f52489f..240aea7e1fdb 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -1,215 +1,87 @@
 USE_DOS2UNIX=		*.c *.cpp *.h *.H *.ini *.conf
 
-DISTNAME=		${PORTNAME:S/m/M/:S/pl/Pl/}-${PORTVERSION:S/./-/g}-src
+DISTNAME=		${PORTNAME}-bundle-src-${PORTVERSION}
 PATCHDIR=		${.CURDIR}/files
+BUILD_WRKSRC=		${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - "${DISTNAME}/Makefile" "${DISTNAME}/mupen64plus.desktop.in" \
-				"${DISTNAME}/pre.mk" "${DISTNAME}/release.mk" "${DISTNAME}/config/*" \
-					"${DISTNAME}/main/*" "${DISTNAME}/plugins/*" "${DISTNAME}/opengl/*"
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \
+				"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
 
-.if ${PKGNAMESUFFIX} == "-base"
-USE_GL=		yes
-USE_SDL=	sdl
+.if ${PKGNAMESUFFIX} == "-core"
+USE_SDL=		sdl
 
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-.	if defined(WITH_NOGUI)
-USE_GNOME=	#
-
-MAKE_ENV+=	GUI=	NONE
-.	endif
-.if defined(WITH_QT4)
-USE_GNOME=	#
-USE_QT_VER=	4
-
-BUILD_DEPENDS+=	lrelease-qt4:${PORTSDIR}/devel/qt4-linguist
-
-MAKE_ENV+=	GUI=	QT4
-HAVE_QT4=	yes
-
-PLIST_SUB+=	TRANSLATIONS=""
+LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2 \
+			png.6:${PORTSDIR}/graphics/png
 .else
-PLIST_SUB+=	TRANSLATIONS="@comment "
-.endif
-
-ALL_TARGET=		mupen64plus
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/RELEASE" "${DISTNAME}/README" "${DISTNAME}/doc/*" "${DISTNAME}/lang/*" \
-				"${DISTNAME}/icons/*" "${DISTNAME}/memory/*" "${DISTNAME}/r4300/*" "${DISTNAME}/debugger/*" \
-						"${DISTNAME}/translations/*" "${DISTNAME}/fonts/*"
-
-MAN1=			mupen64plus.1
-.else
-EXTRA_PATCHES?=		${.CURDIR}/../mupen64plus-base/files/patch-Makefile \
-			${.CURDIR}/../mupen64plus-base/files/patch-pre.mk
 PLIST=			${WRKDIR}/pkg-plist
 .endif
 
-.if ${PKGNAMESUFFIX} == "-dummyaudio"
-ALL_TARGET=		plugins/dummyaudio.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/dummy_audio/*"
+.if ${PKGNAMESUFFIX} == "-ui-console"
+MAN6=	mupen64plus.6
 .endif
 
-.if ${PKGNAMESUFFIX} == "-dummyinput"
-ALL_TARGET=		plugins/dummyinput.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/dummy_input/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-dummyvideo"
-ALL_TARGET=		plugins/dummyvideo.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/dummy_video/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sdlinput"
-ALL_TARGET=		plugins/blight_input.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/blight_input/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-gln64"
-ALL_TARGET=             plugins/glN64.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/glN64/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sdlaudio"
-ALL_TARGET=		plugins/jttl_audio.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/jttl_audio/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sound"
-ALL_TARGET=             plugins/mupen64_audio.so
-EXTRACT_AFTER_ARGS+=     "${DISTNAME}/mupen64_audio/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-input"
-ALL_TARGET=             plugins/mupen64_input.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/mupen64_input/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-rsp"
-ALL_TARGET=             plugins/mupen64_hle_rsp_azimer.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/rsp_hle/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-glide"
-.	if !defined(WITHOUT_YASM)
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
-MAKE_ENV+=	ASM="${LOCALBASE}/bin/yasm"
-.	else
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-MAKE_ENV+=	ASM="${LOCALBASE}/bin/nasm"
-.	endif
-ALL_TARGET=		plugins/glide64.so
-EXTRACT_AFTER_ARGS+=	"${DISTNAME}/glide64/*"
-.endif
-
-.if ${PKGNAMESUFFIX} == "-rice"
-ALL_TARGET=             plugins/ricevideo.so
-EXTRACT_AFTER_ARGS+=    "${DISTNAME}/rice_video/*"
-.endif
-
-post-configure:
-.for f in ${FIXFILES}
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/${f}
-.endfor
-
+.if ${PKGNAMESUFFIX} != "-core"
 post-extract:
-.if ${PKGNAMESUFFIX} == "-base"
-	${GUNZIP_CMD} ${WRKSRC}/doc/${MAN1}.gz
-.endif
+.	if ${PKGNAMESUFFIX} == "-ui-console"
+		@${GUNZIP_CMD} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/${MAN6}.gz
+.	endif
 
-.if ${PKGNAMESUFFIX} != "-base"
 pre-install:
 	@${RM} -f ${PLIST}
-.	if ${PKGNAMESUFFIX} == "-glide"
-		@${ECHO_CMD} "%%DATADIR%%/config/${PLUGIN_NAME:S/g/G/}.ini" >> ${PLIST}
-		@${ECHO_CMD} "@dirrmtry %%DATADIR%%/config" >> ${PLIST}
+.	if ${PKGNAMESUFFIX} == "-video-rice"
+		@${ECHO_CMD} "%%DATADIR%%/RiceVideoLinux.ini" >> ${PLIST}
 .	endif
 
-.	if ${PKGNAMESUFFIX} == "-rice"
-		@${ECHO_CMD} "%%DATADIR%%/config/${PLUGIN_NAME:S/r/R/:S/v/V/}.cfg" >> ${PLIST}
-		@${ECHO_CMD} "%%DATADIR%%/config/${PLUGIN_NAME:S/r/R/:S/v/V/}Linux.ini" >> ${PLIST}
-		@${ECHO_CMD} "@dirrmtry %%DATADIR%%/config" >> ${PLIST}
+.	if ${PKGNAMESUFFIX} == "-input-sdl"
+		@${ECHO_CMD} "%%DATADIR%%/InputAutoCfg.ini" >> ${PLIST}
 .	endif
 
-.	if ${PKGNAMESUFFIX} == "-glN64"
-		@${ECHO_CMD} "%%DATADIR%%/config/${PLUGIN_NAME}.conf" >> ${PLIST}
-		@${ECHO_CMD} "@dirrmtry %%DATADIR%%/config" >> ${PLIST}
+.	if ${PKGNAMESUFFIX} != "-ui-console"
+		@${ECHO_CMD} "lib/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST}
+		@${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST}
+.	else
+		@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
 .	endif
-
-.	if ${PKGNAMESUFFIX} == "-sdlaudio"
-		@${ECHO_CMD} "%%DATADIR%%/config/${PLUGIN_NAME}.conf" >> ${PLIST}
-		@${ECHO_CMD} "@dirrmtry %%DATADIR%%/config" >> ${PLIST}
-.	endif
-
-.	if ${PKGNAMESUFFIX} == "-sdlinput"
-		@${ECHO_CMD} "%%DATADIR%%/config/${PLUGIN_NAME}.conf" >> ${PLIST}
-		@${ECHO_CMD} "@dirrmtry %%DATADIR%%/config" >> ${PLIST}
-.	endif
-
-	@${ECHO_CMD} "%%DATADIR%%/plugins/${PLUGIN_NAME}.so" >> ${PLIST}
-	@${ECHO_CMD} "@dirrmtry %%DATADIR%%/plugins" >> ${PLIST}
-	@${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST}
 .endif
 
 do-install:
-.if ${PKGNAMESUFFIX} == "-base"
+.if ${PKGNAMESUFFIX} == "-core"
 
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmupen64plus.so.2.0.0 \
+		${PREFIX}/lib/libmupen64plus.so.2.0.0
 
-	@${MKDIR} ${DATADIR}/config
-	${INSTALL_DATA} ${WRKSRC}/config/mupen64plus.conf ${DATADIR}/config/
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/* \
+		${DATADIR}
 
-	@${MKDIR} ${DATADIR}/fonts
-	${INSTALL_DATA} ${WRKSRC}/fonts/font.ttf ${DATADIR}/fonts/
-
-	@${MKDIR} ${DATADIR}/lang
-	${INSTALL_DATA} ${WRKSRC}/lang/* ${DATADIR}/lang/
-
-	@${MKDIR} ${DATADIR}/icons
-	@cd ${WRKSRC}/icons && \
-		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/icons/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "${WRKSRC}/icons/{}" "${DATADIR}/icons/{}" \;
-
-	@${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${DESKTOPDIR}
-	
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${PREFIX}/man/man1/
-
-.	if defined(HAVE_QT4)
-		@${MKDIR} ${DATADIR}/translations
-		${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${DATADIR}/translations
-.	endif
+	@${MKDIR} ${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src/api/m64p_*.h \
+		${PREFIX}/include/${PORTNAME}
 
 .	if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/RELEASE ${DOCSDIR}/RELEASE
+		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \
+			${DOCSDIR}/RELEASE
 .	endif
+	${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${PREFIX}/lib/libmupen64plus.so.2
 .else
-	@${MKDIR} ${DATADIR}/plugins
-.	if ${PKGNAMESUFFIX} == "-glide"
-		@${MKDIR} ${DATADIR}/config
-		${INSTALL_DATA} ${WRKSRC}/config/${PLUGIN_NAME:S/g/G/}.ini ${DATADIR}/config/
+.	if ${PKGNAMESUFFIX} == "-ui-console"
+		${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/${MAN6} ${PREFIX}/man/man6/
+.	endif
+.	if ${PKGNAMESUFFIX} == "-video-rice"
+		@${MKDIR} ${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${DATADIR}
 .	endif
 
-.	if ${PKGNAMESUFFIX} == "-rice"
-		@${MKDIR} ${DATADIR}/config
-		${INSTALL_DATA} ${WRKSRC}/config/${PLUGIN_NAME:S/r/R/:S/v/V/}.cfg ${DATADIR}/config/
-		${INSTALL_DATA} ${WRKSRC}/config/${PLUGIN_NAME:S/r/R/:S/v/V/}Linux.ini ${DATADIR}/config/
+.	if ${PKGNAMESUFFIX} == "-input-sdl"
+		@${MKDIR} ${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${DATADIR}
 .	endif
 
-.	if ${PKGNAMESUFFIX} == "-glN64"
-		@${MKDIR} ${DATADIR}/config
-		${INSTALL_DATA} ${WRKSRC}/config/${PLUGIN_NAME}.conf ${DATADIR}/config/
+.	if ${PKGNAMESUFFIX} != "-ui-console"
+		${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.so ${PREFIX}/lib
+.	else
+		${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
 .	endif
-
-.	if ${PKGNAMESUFFIX} == "-sdlaudio"
-		@${MKDIR} ${DATADIR}/config
-		${INSTALL_DATA} ${WRKSRC}/config/${PLUGIN_NAME}.conf ${DATADIR}/config/
-.	endif
-
-.	if ${PKGNAMESUFFIX} == "-sdlinput"
-		@${MKDIR} ${DATADIR}/config
-		${INSTALL_DATA} ${WRKSRC}/config/${PLUGIN_NAME}.conf ${DATADIR}/config/
-.	endif
-
-	${INSTALL_PROGRAM} ${WRKSRC}/plugins/${PLUGIN_NAME}.so ${DATADIR}/plugins/
 .endif
diff --git a/emulators/mupen64plus-core/distinfo b/emulators/mupen64plus-core/distinfo
index 4abc1255a9d0..2098c76d7eaf 100644
--- a/emulators/mupen64plus-core/distinfo
+++ b/emulators/mupen64plus-core/distinfo
@@ -1,3 +1,2 @@
-MD5 (mupen64plus/Mupen64Plus-1-5-src.tar.gz) = c224b045d343ff02f6f933d328861b01
-SHA256 (mupen64plus/Mupen64Plus-1-5-src.tar.gz) = 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
-SIZE (mupen64plus/Mupen64Plus-1-5-src.tar.gz) = 2348443
+SHA256 (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 28868b299372a7b6a1628ee7340656748ed6316fd210d52b82f27518cec7ab8e
+SIZE (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 1703878
diff --git a/emulators/mupen64plus-core/files/patch-Makefile b/emulators/mupen64plus-core/files/patch-Makefile
deleted file mode 100644
index 8c3f72b2c671..000000000000
--- a/emulators/mupen64plus-core/files/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile	2009-01-04 13:47:07.000000000 -0500
-+++ Makefile	2009-01-09 00:52:30.000000000 -0500
-@@ -29,12 +29,18 @@
-   include ./pre.mk
- endif
- 
-+ifeq ($OS), FREEBSD)
-+  LDFLAGS += -Wl,-export-dynamic
-+endif
- ifeq ($(OS), LINUX)
-   LDFLAGS += -Wl,-export-dynamic
- endif
- 
- # set executable stack as a linker option for X86 architecture, for dynamic recompiler
- ifeq ($(CPU), X86)
-+  ifeq ($(OS), FREEBSD)
-+    LDFLAGS += -z execstack
-+  endif
-   ifeq ($(OS), LINUX)
-     LDFLAGS += -z execstack
-   endif
-@@ -159,7 +165,7 @@
- # handle dynamic recompiler objects
- ifneq ($(NO_ASM), 1)
-   ifeq ($(CPU), X86)
--    ifeq ($(ARCH), 64BITS)
-+    ifeq ($(ARCH_DETECTED), 64BITS)
-       DYNAREC = x86_64
-     else
-       DYNAREC = x86
diff --git a/emulators/mupen64plus-core/files/patch-main_romcache.h b/emulators/mupen64plus-core/files/patch-main_romcache.h
deleted file mode 100644
index 76c03cc36786..000000000000
--- a/emulators/mupen64plus-core/files/patch-main_romcache.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- main/romcache.h	2009-01-09 01:16:19.000000000 -0500
-+++ main/romcache.h	2009-01-09 01:16:33.000000000 -0500
-@@ -23,6 +23,7 @@
- #define __ROMCACHE_H__
- 
- #include <limits.h> 
-+#include <time.h>
- #include "md5.h"
- 
- #define COMMENT_MAXLENGTH 256
diff --git a/emulators/mupen64plus-core/files/patch-pre.mk b/emulators/mupen64plus-core/files/patch-pre.mk
deleted file mode 100644
index 8c00a063c926..000000000000
--- a/emulators/mupen64plus-core/files/patch-pre.mk
+++ /dev/null
@@ -1,173 +0,0 @@
---- pre.mk	2009-01-09 00:29:06.000000000 -0500
-+++ pre.mk	2009-01-09 00:51:15.000000000 -0500
-@@ -21,26 +21,34 @@
- 
- # detect system architecture: i386, x86_64, or PPC/PPC64
- UNAME = $(shell uname -m)
-+ifeq ("$(UNAME)","amd64")
-+  CPU = X86
-+  ifeq ("$(BITS)", "32")
-+    ARCH_DETECTED = 64BITS_32
-+  else
-+    ARCH_DETECTED = 64BITS
-+  endif
-+endif
- ifeq ("$(UNAME)","x86_64")
-   CPU = X86
-   ifeq ("$(BITS)", "32")
--    ARCH = 64BITS_32
-+    ARCH_DETECTED = 64BITS_32
-   else
--    ARCH = 64BITS
-+    ARCH_DETECTED = 64BITS
-   endif
- endif
- ifneq ("$(filter i%86,$(UNAME))","")
-   CPU = X86
--  ARCH = 32BITS
-+  ARCH_DETECTED = 32BITS
- endif
- ifeq ("$(UNAME)","ppc")
-   CPU = PPC
--  ARCH = 32BITS
-+  ARCH_DETECTED = 32BITS
-   NO_ASM = 1
- endif
- ifeq ("$(UNAME)","ppc64")
-   CPU = PPC
--  ARCH = 64BITS
-+  ARCH_DETECTED = 64BITS
-   NO_ASM = 1
- endif
- 
-@@ -56,6 +64,9 @@
-   OS = OSX
-   LDFLAGS += -liconv -lpng
- endif
-+ifeq ("$(UNAME)","FreeBSD")
-+  OS = FREEBSD
-+endif
- 
- ifeq ($(OS),)
-    $(warning OS not supported or detected, using default linux options.)
-@@ -66,8 +77,9 @@
- ifeq ($(shell which sdl-config 2>/dev/null),)
-   $(error No SDL development libraries found!)
- endif
--SDL_FLAGS	= $(shell sdl-config --cflags)
--SDL_LIBS	= $(shell sdl-config --libs)
-+
-+SDL_FLAGS	= `${SDL_CONFIG} --cflags`
-+SDL_LIBS	= `${SDL_CONFIG} --libs`
- 
- # test for presence of FreeType
- ifeq ($(shell which freetype-config 2>/dev/null),)
-@@ -147,23 +159,26 @@
- endif
- 
- # set base program pointers and flags
--CC      = gcc
--CXX     = g++
--LD      = g++
-+CC      ?= gcc
-+CXX     ?= g++
-+LD      ?= g++
- ifeq ($(OS),LINUX)
--STRIP	= strip -s
-+STRIP	?= strip -s
-+endif
-+ifeq ($(OS),FREEBSD)
-+STRIP	?= strip -s
- endif
- ifeq ($(OS),OSX)
--STRIP	= strip -x 
-+STRIP	?= strip -x 
- endif
--RM      = rm
--RM_F    = rm -f
--MV      = mv
--CP      = cp
--MD      = mkdir
--FIND    = find
--PROF    = gprof
--INSTALL = ginstall
-+RM      ?= rm
-+RM_F    ?= rm -f
-+MV      ?= mv
-+CP      ?= cp
-+MD      ?= mkdir
-+FIND    ?= find
-+PROF    ?= gprof
-+INSTALL ?= ginstall
- 
- # create SVN version defines
- MUPEN_RELEASE = 1.5
-@@ -185,23 +200,40 @@
- endif
- 
- # set base CFLAGS and LDFLAGS
--CFLAGS += -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
--CORE_LDFLAGS += -lz -lm -lpng -lfreetype -ldl
-+CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
-+ifeq ($(OS), FREEBSD)
-+  CORE_LDFLAGS += -lz -lm -lpng -lfreetype
-+else
-+  CORE_LDFLAGS += -lz -lm -lpng -lfreetype -ldl
-+endif
- 
- # set special flags per-system
- ifeq ($(CPU), X86)
--  ifeq ($(ARCH), 64BITS)
--    CFLAGS += -march=athlon64
-+  ifeq ($(ARCH_DETECTED), 64BITS)
-+    ifeq ($(OS), FREEBSD)
-+      CFLAGS +=
-+    else
-+      CFLAGS += -march=athlon64
-+    endif
-   else
--    CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse
-+    ifeq ($(OS), FREEBSD)
-+      CFLAGS += -mmmx -msse
-+    else
-+      CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse
-+    endif
-     ifneq ($(PROFILE), 1)
-       CFLAGS += -fomit-frame-pointer
-     endif
-   endif
-   # tweak flags for 32-bit build on 64-bit system
--  ifeq ($(ARCH), 64BITS_32)
--    CFLAGS += -m32
--    LDFLAGS += -m32 -m elf_i386
-+  ifeq ($(ARCH_DETECTED), 64BITS_32)
-+    ifeq ($(OS), FREEBSD)
-+      CFLAGS += 
-+      LDFLAGS += 
-+    else
-+      CFLAGS += -m32
-+      LDFLAGS += -m32 -m elf_i386
-+    endif
-   endif
- endif
- ifeq ($(CPU), PPC)
-@@ -209,6 +241,9 @@
- endif
- 
- # set CFLAGS, LIBS, and LDFLAGS for external dependencies
-+ifeq ($(OS),FREEBSD)
-+  PLUGIN_LDFLAGS	= -Wl,-Bsymbolic -shared
-+endif
- ifeq ($(OS),LINUX)
-   PLUGIN_LDFLAGS	= -Wl,-Bsymbolic -shared
- endif
-@@ -216,6 +251,9 @@
-   PLUGIN_LDFLAGS	= -bundle
- endif
- 
-+ifeq ($(OS),FREEBSD)
-+  LIBGL_LIBS	= -L${LOCALBASE}/lib -lGL -lGLU
-+endif
- ifeq ($(OS),LINUX)
-   LIBGL_LIBS	= -L/usr/X11R6/lib -lGL -lGLU
- endif
diff --git a/emulators/mupen64plus-core/pkg-descr b/emulators/mupen64plus-core/pkg-descr
index 6cf8e0e4ea32..ecb4945ba5cf 100644
--- a/emulators/mupen64plus-core/pkg-descr
+++ b/emulators/mupen64plus-core/pkg-descr
@@ -1,8 +1,8 @@
-Mupen64Plus is a plugin-based N64 emulator for Linux, FreeBSD which is capable 
-of accurately playing many games. Included are four MIPS R4300 CPU emulators, 
-with dynamic recompilers for 32-bit x86 and 64-bit amd64 systems, and necessary
-plugins for audio, graphical rendering (RDP), signal co-processor (RSP), and 
-input. There are 3 OpenGL video plugins included: glN64, RiceVideoLinux, and 
-Glide64.
+Mupen64Plus is a plugin-based N64 emulator for Linux, Mac OSX, FreeBSD, and 
+Windows which is capable of accurately playing many games. Included are four 
+MIPS R4300 CPU emulators, with dynamic recompilers for 32-bit x86 and 64-bit 
+amd64 systems, and necessary plugins for audio, graphical rendering (RDP), 
+signal co-processor (RSP), and input. There are 3 OpenGL video plugins 
+included: glN64, RiceVideoLinux, and Glide64.
 
 WWW:	http://code.google.com/p/mupen64plus/
diff --git a/emulators/mupen64plus-core/pkg-plist b/emulators/mupen64plus-core/pkg-plist
index a58fe74167a2..b5ab5d9e70e3 100644
--- a/emulators/mupen64plus-core/pkg-plist
+++ b/emulators/mupen64plus-core/pkg-plist
@@ -1,99 +1,17 @@
-bin/mupen64plus
-share/applications/mupen64plus.desktop
-%%DATADIR%%/config/mupen64plus.conf
-%%DATADIR%%/fonts/font.ttf
-%%DATADIR%%/lang/english.lng
-%%DATADIR%%/icons/16x16/view-fullscreen.png
-%%DATADIR%%/icons/16x16/cpu.png
-%%DATADIR%%/icons/16x16/preferences-system.png
-%%DATADIR%%/icons/16x16/media-playback-stop.png
-%%DATADIR%%/icons/16x16/audio-card.png
-%%DATADIR%%/icons/16x16/edit-delete.png
-%%DATADIR%%/icons/16x16/input-gaming.png
-%%DATADIR%%/icons/16x16/video-display.png
-%%DATADIR%%/icons/16x16/document-open.png
-%%DATADIR%%/icons/16x16/document-save-all.png
-%%DATADIR%%/icons/16x16/mupen64plus.png
-%%DATADIR%%/icons/16x16/gtk-about.png
-%%DATADIR%%/icons/16x16/document-save-as.png
-%%DATADIR%%/icons/16x16/application-exit.png
-%%DATADIR%%/icons/16x16/window-close.png
-%%DATADIR%%/icons/16x16/star.png
-%%DATADIR%%/icons/16x16/media-playback-pause.png
-%%DATADIR%%/icons/16x16/document-save.png
-%%DATADIR%%/icons/16x16/mupen64cart.png
-%%DATADIR%%/icons/16x16/document-revert.png
-%%DATADIR%%/icons/16x16/view-refresh.png
-%%DATADIR%%/icons/16x16/media-playback-start.png
-%%DATADIR%%/icons/16x16/document-properties.png
-%%DATADIR%%/icons/22x22/view-fullscreen.png
-%%DATADIR%%/icons/22x22/preferences-system.png
-%%DATADIR%%/icons/22x22/media-playback-stop.png
-%%DATADIR%%/icons/22x22/edit-delete.png
-%%DATADIR%%/icons/22x22/document-open.png
-%%DATADIR%%/icons/22x22/document-save-as.png
-%%DATADIR%%/icons/22x22/star.png
-%%DATADIR%%/icons/22x22/media-playback-pause.png
-%%DATADIR%%/icons/22x22/document-save.png
-%%DATADIR%%/icons/22x22/mupen64cart.png
-%%DATADIR%%/icons/22x22/document-revert.png
-%%DATADIR%%/icons/22x22/view-refresh.png
-%%DATADIR%%/icons/22x22/media-playback-start.png
-%%DATADIR%%/icons/22x22/document-properties.png
-%%DATADIR%%/icons/32x32/view-fullscreen.png
-%%DATADIR%%/icons/32x32/cpu.png
-%%DATADIR%%/icons/32x32/preferences-system.png
-%%DATADIR%%/icons/32x32/media-playback-stop.png
-%%DATADIR%%/icons/32x32/audio-card.png
-%%DATADIR%%/icons/32x32/edit-delete.png
-%%DATADIR%%/icons/32x32/input-gaming.png
-%%DATADIR%%/icons/32x32/video-display.png
-%%DATADIR%%/icons/32x32/document-open.png
-%%DATADIR%%/icons/32x32/dialog-warning.png
-%%DATADIR%%/icons/32x32/mupen64plus.png
-%%DATADIR%%/icons/32x32/document-save-as.png
-%%DATADIR%%/icons/32x32/star.png
-%%DATADIR%%/icons/32x32/media-playback-pause.png
-%%DATADIR%%/icons/32x32/dialog-error.png
-%%DATADIR%%/icons/32x32/document-save.png
-%%DATADIR%%/icons/32x32/dialog-question.png
-%%DATADIR%%/icons/32x32/mupen64cart.png
-%%DATADIR%%/icons/32x32/document-revert.png
-%%DATADIR%%/icons/32x32/view-refresh.png
-%%DATADIR%%/icons/32x32/media-playback-start.png
-%%DATADIR%%/icons/32x32/document-properties.png
-%%DATADIR%%/icons/LICENSES
-%%DATADIR%%/icons/applications-utilities.png
-%%DATADIR%%/icons/australia.png
-%%DATADIR%%/icons/europe.png
-%%DATADIR%%/icons/france.png
-%%DATADIR%%/icons/germany.png
-%%DATADIR%%/icons/italy.png
-%%DATADIR%%/icons/japan.png
-%%DATADIR%%/icons/japanusa.png
-%%DATADIR%%/icons/mupen64cart.svg
-%%DATADIR%%/icons/mupen64logo.png
-%%DATADIR%%/icons/mupen64logo.svg
-%%DATADIR%%/icons/mupen64plus-large.png
-%%DATADIR%%/icons/mupen64plus.svg
-%%DATADIR%%/icons/preferences-system-network.png
-%%DATADIR%%/icons/preferences-system.png
-%%DATADIR%%/icons/spain.png
-%%DATADIR%%/icons/usa.png
-%%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_de.ts
-%%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_en.ts
-%%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_nb.ts
-%%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_nl.ts
+include/mupen64plus/m64p_common.h
+include/mupen64plus/m64p_config.h
+include/mupen64plus/m64p_debugger.h
+include/mupen64plus/m64p_frontend.h
+include/mupen64plus/m64p_plugin.h
+include/mupen64plus/m64p_types.h
+include/mupen64plus/m64p_vidext.h
+lib/libmupen64plus.so.2
+lib/libmupen64plus.so.2.0.0
+%%DATADIR%%/font.ttf
+%%DATADIR%%/mupen64plus.cht
+%%DATADIR%%/mupen64plus.ini
+%%DATADIR%%/mupencheat.txt
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE
-@dirrmtry share/applications
-%%TRANSLATIONS%%@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/icons/32x32
-@dirrm %%DATADIR%%/icons/22x22
-@dirrm %%DATADIR%%/icons/16x16
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/lang
-@dirrmtry %%DATADIR%%/config
-@dirrmtry %%DATADIR%%/plugins
 @dirrmtry %%DATADIR%%
+@dirrm include/mupen64plus
 %%PORTDOCS%%@dirrm %%DOCSDIR%%