diff --git a/srcpkgs/libmp4v2/libmp4v2-devel.template b/srcpkgs/libmp4v2/libmp4v2-devel.template
index e0a37de652..246f6f5c07 100644
--- a/srcpkgs/libmp4v2/libmp4v2-devel.template
+++ b/srcpkgs/libmp4v2/libmp4v2-devel.template
@@ -5,14 +5,11 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 Add_dependency run libmp4v2
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/libmp4v2/mpeg4ip.template b/srcpkgs/libmp4v2/mpeg4ip.template
index 42f3c425eb..de2ea786ed 100644
--- a/srcpkgs/libmp4v2/mpeg4ip.template
+++ b/srcpkgs/libmp4v2/mpeg4ip.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains tools for processing MPEG-4 files."
 
-revision=1
-
 Add_dependency run glibc
 Add_dependency run libstdc++
 Add_dependency run libgcc
@@ -14,6 +12,6 @@ Add_dependency run libmp4v2
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	vmove usr/bin usr
+	vmove usr/share/man usr/share
 }
diff --git a/srcpkgs/libmp4v2/patches/dup_strcasestr_proto.diff b/srcpkgs/libmp4v2/patches/dup_strcasestr_proto.diff
deleted file mode 100644
index e369853b60..0000000000
--- a/srcpkgs/libmp4v2/patches/dup_strcasestr_proto.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- include/mpeg4ip.h.orig	2009-12-31 00:27:18.740337279 +0100
-+++ include/mpeg4ip.h	2009-12-31 00:27:45.859218323 +0100
-@@ -120,14 +120,6 @@
- #endif
- #include <sys/param.h>
- 
--#ifdef __cplusplus
--extern "C" {
--#endif
--char *strcasestr(const char *haystack, const char *needle);
--#ifdef __cplusplus
--}
--#endif
--
- #define OPEN_RDWR O_RDWR
- #define OPEN_CREAT O_CREAT 
- #define OPEN_RDONLY O_RDONLY
diff --git a/srcpkgs/libmp4v2/template b/srcpkgs/libmp4v2/template
index 32eaf88b72..cfaa54d8a3 100644
--- a/srcpkgs/libmp4v2/template
+++ b/srcpkgs/libmp4v2/template
@@ -1,13 +1,15 @@
 # Template file for 'libmp4v2'
 pkgname=libmp4v2
-version=1.6.1
-revision=2
-wrksrc="mpeg4ip-${version}"
-distfiles="http://repository.slacky.eu/slackware-12.1/multimedia/mpeg4ip/$version/src/mpeg4ip-$version.tar.gz"
-build_style=custom-install
+version=1.9.1
+wrksrc="mp4v2-${version}"
+distfiles="http://mp4v2.googlecode.com/files/mp4v2-$version.tar.bz2"
+build_style=gnu_configure
+make_install_args="install-man"
 short_desc="MPEG-4 library from mpeg4ip"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=7049793ab18efc7d36b0581ecf137b59b1d9e4cee1df20a4241ffd37ce510214
+homepage="http://code.google.com/p/mp4v2/"
+license="MPL-1.1"
+checksum=5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4
 long_desc="
  The MPEG4IP project provides a standards-based system for encoding,
  streaming, and playing encoded audio, video and text. To achieve
@@ -18,30 +20,3 @@ subpackages="$pkgname-devel mpeg4ip"
 Add_dependency run glibc
 Add_dependency run libgcc
 Add_dependency run libstdc++
-
-do_build()
-{
-	cd ${wrksrc} || return 1
-	touch bootstrapped && echo "" > lib/rtp/configure && \
-		echo "" > lib/SDLAudio/configure
-	./configure --prefix=/usr USENASM=no || return 1
-	for dir in lib/gnu lib/mp4av lib/mp4v2; do
-		cd ${wrksrc}/${dir}
-		make || return 1
-	done
-}
-
-do_install()
-{
-	for dir in lib/gnu lib/mp4av lib/mp4v2; do
-		cd ${wrksrc}/${dir}
-		make DESTDIR=${DESTDIR} install || return 1
-	done
-	install -d ${DESTDIR}/usr/include
-	install -m644 ${wrksrc}/include/mpeg4ip.h \
-		${DESTDIR}/usr/include || return 1
-	install -m644 ${wrksrc}/include/mpeg4ip_version.h \
-		${DESTDIR}/usr/include || return 1
-	install -m644 ${wrksrc}/mpeg4ip_config.h \
-		${DESTDIR}/usr/include || return 1
-}