diff --git a/mupen64plus/.footprint b/mupen64plus/.footprint
index dc778f99b..f931b87b9 100644
--- a/mupen64plus/.footprint
+++ b/mupen64plus/.footprint
@@ -1,110 +1,30 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mupen64plus
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/mupen64plus/
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_common.h
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_config.h
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_debugger.h
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_frontend.h
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_plugin.h
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_types.h
+-rw-r--r--	root/root	usr/include/mupen64plus/m64p_vidext.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libmupen64plus.so.2.0.0
+drwxr-xr-x	root/root	usr/lib/mupen64plus/
+-rw-r--r--	root/root	usr/lib/mupen64plus/mupen64plus-audio-sdl.so
+-rw-r--r--	root/root	usr/lib/mupen64plus/mupen64plus-input-sdl.so
+-rw-r--r--	root/root	usr/lib/mupen64plus/mupen64plus-rsp-hle.so
+-rw-r--r--	root/root	usr/lib/mupen64plus/mupen64plus-video-rice.so
 drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/mupen64plus.1.gz
+drwxr-xr-x	root/root	usr/man/man6/
+-rw-r--r--	root/root	usr/man/man6/mupen64plus.6.gz
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/mupen64plus.desktop
 drwxr-xr-x	root/root	usr/share/mupen64plus/
-drwxr-xr-x	root/root	usr/share/mupen64plus/config/
--rw-r--r--	root/root	usr/share/mupen64plus/config/Glide64.ini
--rw-r--r--	root/root	usr/share/mupen64plus/config/RiceVideo.cfg
--rw-r--r--	root/root	usr/share/mupen64plus/config/RiceVideoLinux.ini
--rw-r--r--	root/root	usr/share/mupen64plus/config/blight_input.conf
--rw-r--r--	root/root	usr/share/mupen64plus/config/glN64.conf
--rw-r--r--	root/root	usr/share/mupen64plus/config/jttl_audio.conf
--rw-r--r--	root/root	usr/share/mupen64plus/config/mupen64plus.conf
-drwxr-xr-x	root/root	usr/share/mupen64plus/fonts/
--rw-r--r--	root/root	usr/share/mupen64plus/fonts/font.ttf
-drwxr-xr-x	root/root	usr/share/mupen64plus/icons/
-drwxr-xr-x	root/root	usr/share/mupen64plus/icons/16x16/
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/application-exit.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/audio-card.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/cpu.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/document-open.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/document-properties.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/document-revert.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/document-save-all.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/document-save-as.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/document-save.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/edit-delete.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/gtk-about.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/input-gaming.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/media-playback-pause.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/media-playback-start.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/media-playback-stop.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/mupen64cart.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/mupen64plus.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/preferences-system.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/star.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/video-display.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/view-fullscreen.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/view-refresh.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/16x16/window-close.png
-drwxr-xr-x	root/root	usr/share/mupen64plus/icons/22x22/
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/document-open.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/document-properties.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/document-revert.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/document-save-as.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/document-save.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/edit-delete.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/media-playback-pause.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/media-playback-start.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/media-playback-stop.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/mupen64cart.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/preferences-system.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/star.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/view-fullscreen.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/22x22/view-refresh.png
-drwxr-xr-x	root/root	usr/share/mupen64plus/icons/32x32/
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/audio-card.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/cpu.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/dialog-error.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/dialog-question.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/dialog-warning.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/document-open.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/document-properties.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/document-revert.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/document-save-as.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/document-save.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/edit-delete.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/input-gaming.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/media-playback-pause.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/media-playback-start.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/media-playback-stop.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/mupen64cart.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/mupen64plus.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/preferences-system.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/star.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/video-display.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/view-fullscreen.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/32x32/view-refresh.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/applications-utilities.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/australia.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/europe.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/france.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/germany.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/italy.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/japan.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/japanusa.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/mupen64logo.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/mupen64plus-large.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/preferences-system-network.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/preferences-system.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/spain.png
--rw-r--r--	root/root	usr/share/mupen64plus/icons/usa.png
-drwxr-xr-x	root/root	usr/share/mupen64plus/lang/
--rw-r--r--	root/root	usr/share/mupen64plus/lang/english.lng
+-rw-r--r--	root/root	usr/share/mupen64plus/InputAutoCfg.ini
+-rw-r--r--	root/root	usr/share/mupen64plus/RiceVideoLinux.ini
+-rw-r--r--	root/root	usr/share/mupen64plus/font.ttf
+-rw-r--r--	root/root	usr/share/mupen64plus/mupen64plus.cht
 -rw-r--r--	root/root	usr/share/mupen64plus/mupen64plus.ini
-drwxr-xr-x	root/root	usr/share/mupen64plus/plugins/
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/blight_input.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/dummyaudio.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/dummyvideo.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/glN64.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/glide64.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/jttl_audio.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/mupen64_hle_rsp_azimer.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/mupen64_input.so
--rw-r--r--	root/root	usr/share/mupen64plus/plugins/ricevideo.so
+-rw-r--r--	root/root	usr/share/mupen64plus/mupencheat.txt
diff --git a/mupen64plus/.md5sum b/mupen64plus/.md5sum
index 4c69a0be6..cbfde379d 100644
--- a/mupen64plus/.md5sum
+++ b/mupen64plus/.md5sum
@@ -1,2 +1,2 @@
-c224b045d343ff02f6f933d328861b01  Mupen64Plus-1-5-src.tar.gz
-ae4db1f0b5d76a28c3f2f95f6c7fb755  mupen64plus-glibc.diff
+81c4f11c341d7ea4dbd81cf2f0467dc2  mupen64plus-bundle-src-1.99.4.tar.gz
+e1bbd3ae079ae5e35e855af9a89c3328  mupen64plus.diff
diff --git a/mupen64plus/Pkgfile b/mupen64plus/Pkgfile
index aae77dc7a..fe3df0516 100644
--- a/mupen64plus/Pkgfile
+++ b/mupen64plus/Pkgfile
@@ -1,19 +1,17 @@
 # Description: A Nintendo 64 emulator desgined to be multi-OS
 # URL: http://code.google.com/p/mupen64plus/
 # Maintainer: Mikhail Kolesnik, mike at openbunker dot org
-# Depends on: gtk sdl_ttf
+# Depends on: sdl_ttf libpng
 
 name=mupen64plus
-version=1.5
-release=2
-source=(http://mupen64plus.googlecode.com/files/Mupen64Plus-${version//./-}-src.tar.gz\
-		$name-glibc.diff)
+version=1.99.4
+release=1
+source=(http://mupen64plus.googlecode.com/files/$name-bundle-src-$version.tar.gz
+		$name.diff)
 
 build() {
-	cd Mupen64Plus-*
-	patch -p1 -i $SRC/$name-glibc.diff
-	make PREFIX=/usr all
-	make PREFIX=$PKG/usr install
-	rm -rf $PKG/usr/share/$name/doc
-	find $PKG/usr/share/mupen64plus/lang/ ! -name "english.lng" -type f -delete
+	cd $name-bundle-src-$version
+	patch -p1 -i $SRC/$name.diff
+	./m64p_build.sh
+	./m64p_install.sh DESTDIR=$PKG PREFIX=/usr
 }
diff --git a/mupen64plus/mupen64plus-glibc.diff b/mupen64plus/mupen64plus-glibc.diff
deleted file mode 100644
index f0f496634..000000000
--- a/mupen64plus/mupen64plus-glibc.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nru Mupen64Plus-1-5-src-orig/glide64/Combine.cpp Mupen64Plus-1-5-src/glide64/Combine.cpp
---- Mupen64Plus-1-5-src-orig/glide64/Combine.cpp	2009-12-11 14:19:27.000000000 +0200
-+++ Mupen64Plus-1-5-src/glide64/Combine.cpp	2009-12-11 14:21:56.000000000 +0200
-@@ -11873,7 +11873,8 @@
-   LOG ("InitCombine() ");
-   memset(&cmb, 0, sizeof(cmb));
-   const char *extensions = grGetString (GR_EXTENSION);
--  if (char * extstr = strstr(extensions, "COMBINE")) {
-+  const char *extstr = strstr(extensions, "COMBINE");
-+  if (extstr) {
-     if (!strncmp(extstr, "COMBINE", 7)) {
-       LOG ("extensions ");
-       cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
-diff -Nru Mupen64Plus-1-5-src-orig/glide64/Main.cpp Mupen64Plus-1-5-src/glide64/Main.cpp
---- Mupen64Plus-1-5-src-orig/glide64/Main.cpp	2009-12-11 14:19:27.000000000 +0200
-+++ Mupen64Plus-1-5-src/glide64/Main.cpp	2009-12-11 14:23:11.000000000 +0200
-@@ -784,7 +784,8 @@
-   printf("bebefore2\n");
-   if (settings.fb_hires)
-   {
--    if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
-+    const char * extstr = strstr(extensions, "TEXTUREBUFFER");
-+    if (extstr)
-     {
-       if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
-       {
diff --git a/mupen64plus/mupen64plus.diff b/mupen64plus/mupen64plus.diff
new file mode 100644
index 000000000..96e398b47
--- /dev/null
+++ b/mupen64plus/mupen64plus.diff
@@ -0,0 +1,11 @@
+diff -Nru mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-core/projects/unix/Makefile mupen64plus-bundle-src-1.99.4/source/mupen64plus-core/projects/unix/Makefile
+--- mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-core/projects/unix/Makefile	2010-12-19 16:31:49.000000000 +0200
++++ mupen64plus-bundle-src-1.99.4/source/mupen64plus-core/projects/unix/Makefile	2010-12-19 16:32:00.000000000 +0200
+@@ -368,7 +368,6 @@
+ 	$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
+ 	$(INSTALL) -d -v "$(DESTDIR)$(INCDIR)"
+ 	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
+-	if [ `id -u` -eq 0 ]; then $(LDCONFIG); fi
+ 
+ uninstall:
+ 	$(RM) -f "$(DESTDIR)$(LIBDIR)/$(TARGET)"