diff --git a/srcpkgs/mutter/mutter-devel.template b/srcpkgs/mutter/mutter-devel.template
index 9280bfb225c..9ab95e8f139 100644
--- a/srcpkgs/mutter/mutter-devel.template
+++ b/srcpkgs/mutter/mutter-devel.template
@@ -1,15 +1,37 @@
-# Template file for 'clutter-gtk--devel'.
+# Template file for 'mutter-devel'.
 #
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run gtk+3-devel
+Add_dependency run GConf-devel
+Add_dependency run startup-notification-devel
+Add_dependency run libcanberra-devel
+Add_dependency run libXrender-devel
+Add_dependency run clutter-devel
+Add_dependency run MesaLib-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXcomposite-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libgirepository-devel
+Add_dependency run libXcursor-devel
+Add_dependency run libXrandr-devel
+Add_dependency run libXext-devel
+Add_dependency run libXinerama-devel
+Add_dependency run json-glib-devel
+Add_dependency run libdrm-devel
+Add_dependency run libXi-devel
+Add_dependency run libffi-devel
+Add_dependency run mutter
+
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/gir-1.0
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/mutter/*.gir ${DESTDIR}/usr/share/gir-1.0
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+	vmove "usr/lib/mutter/*.gir" usr/share/gir-1.0
 }
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index f6ba5382600..e2e3eb9e87c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
 version=3.0.2.1
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --disable-scrollkeeper
@@ -56,34 +56,23 @@ Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
 Add_dependency build gtk+3-devel
-Add_dependency build glib-devel
-Add_dependency build libX11-devel
-Add_dependency build gdk-pixbuf-devel
 Add_dependency build GConf-devel
 Add_dependency build startup-notification-devel
 Add_dependency build libcanberra-devel
 Add_dependency build libXrender-devel
 Add_dependency build clutter-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libXdamage-devel
 Add_dependency build libXcomposite-devel
-Add_dependency build cairo-devel
 Add_dependency build libXfixes-devel
 Add_dependency build libgirepository-devel
 Add_dependency build libXcursor-devel
 Add_dependency build libXrandr-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
 Add_dependency build libXext-devel
 Add_dependency build libXinerama-devel
 Add_dependency build json-glib-devel
-Add_dependency build libpng-devel
 Add_dependency build libdrm-devel
 Add_dependency build libXi-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
 Add_dependency build libffi-devel
 
 Add_dependency full zenity