diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile
index dd0d78a961f3..f07395201232 100644
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@@ -5,43 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mupen64
-PORTVERSION=	0.0.8
-PORTREVISION=	3
-CATEGORIES+=	emulators
-MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
+PORTVERSION=	0.0.10
 PKGNAMESUFFIX=	-sdlinput
-DISTNAME=	blight_input-${PORTVERSION}-b
 
-MAINTAINER?=	tlp@LiquidX.org
 COMMENT=	Blight's SDL input plugin for Mupen64
 
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+
+FIXFILES=	#
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_SDL=	sdl
-USE_GCC=	3.4
-USE_AUTOTOOLS=	autoheader:261
-ONLY_FOR_ARCHS=	i386
 
 PLUGIN_NAME=	blight_input
-PLIST_FILES=	share/mupen64/plugins/${PLUGIN_NAME}.so
-PLIST_DIRS=	share/mupen64/plugins
-PLIST_DIRS+=	share/mupen64
 
-do-install:
-	@${MKDIR} ${PREFIX}/share/mupen64/plugins
-	${INSTALL_SCRIPT} ${WRKSRC}/src/.libs/${PLUGIN_NAME}.so \
-		${PREFIX}/share/mupen64/plugins/
+MASTERDIR=	${.CURDIR}/../mupen64-base
 
-.include <bsd.port.pre.mk>
+OPTIONS=	#
 
-CFLAGS+=	-fPIC
-CFLAGS+=	-O3 -fomit-frame-pointer -funroll-loops -ffast-math -Wall -pipe
-CFLAGS+=	-DX86 -mcpu=athlon
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-sdlinput/distinfo b/emulators/mupen64-sdlinput/distinfo
deleted file mode 100644
index 8b5cf15402f8..000000000000
--- a/emulators/mupen64-sdlinput/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (blight_input-0.0.8-b.tar.gz) = 31661c6fca2dc455d7cbe7e87d316021
-SHA256 (blight_input-0.0.8-b.tar.gz) = d874e6538688d0475fe1cff4fb50e0e777d46821dec94df1b6b05a20bc080142
-SIZE (blight_input-0.0.8-b.tar.gz) = 733624
diff --git a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c b/emulators/mupen64-sdlinput/files/patch-blight_input_SDL_ttf.c
similarity index 52%
rename from emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
rename to emulators/mupen64-sdlinput/files/patch-blight_input_SDL_ttf.c
index c428262407bc..54d968d417df 100644
--- a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
+++ b/emulators/mupen64-sdlinput/files/patch-blight_input_SDL_ttf.c
@@ -1,19 +1,14 @@
---- src/SDL_ttf.c.orig	Tue Oct 14 20:44:17 2003
-+++ src/SDL_ttf.c	Wed Oct  4 08:38:49 2006
-@@ -39,10 +39,10 @@
- #define FREEA(p) free(p)
- #endif
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
+--- blight_input/SDL_ttf.c	2007-10-08 01:36:42.000000000 -0500
++++ blight_input/SDL_ttf.c	2007-10-08 01:39:03.000000000 -0500
+@@ -48,7 +48,6 @@
  #include <freetype/ftoutln.h>
  #include <freetype/ttnameid.h>
+ */
 -#include <freetype/internal/ftobjs.h>
  
- /** hack **/
- #ifndef ft_open_stream
-@@ -272,7 +272,7 @@
+ #ifndef FT_OPEN_STREAM
+ #define FT_OPEN_STREAM ft_open_stream
+@@ -275,7 +274,7 @@
  	}
  	memset(stream, 0, sizeof(*stream));
  
diff --git a/emulators/mupen64-sdlinput/pkg-descr b/emulators/mupen64-sdlinput/pkg-descr
deleted file mode 100644
index 6b42e6932a83..000000000000
--- a/emulators/mupen64-sdlinput/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Blight's SDL input plugin for Mupen64
--
-Mupen64 is a highly portable Nintendo 64 emulator. It has been developed 
-on/for Linux originally but has already been ported successfully to other 
-operating systems. The program can easily be ported to all operating systems 
-supported by the SDL library.
-
-In its current state, the emulator is highly compatible and uses a plugin 
-system. With the correct plugins ("correct" can be computer dependent), it 
-can achieve nearly perfect graphics and sound in many games.
-
-WWW: http://mupen64.emulation64.com/
-
-- Travis Poppe
-tlp@liquidx.org
diff --git a/emulators/mupen64-sdlinput/pkg-message b/emulators/mupen64-sdlinput/pkg-message
deleted file mode 100644
index d53470396a22..000000000000
--- a/emulators/mupen64-sdlinput/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
--------------------------------------------------------------------------------
-If you have installed/upgraded any new plugins or are upgrading from a previous
-version of Mupen64, please note that in order for these changes to take effect,
-you -must- backup and then remove ~/.mupen64 first. After you have removed the
-directory, run 'mupen64' to re-create it. Then, manually copy back your save 
-files/other data you need from the backup if necessary.
-
-Enjoy!
--------------------------------------------------------------------------------