diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 06cdfbb963..c3e8d1dbf8 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,11 +1,11 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=1.1.2
-revision=2
-hostmakedepends="automake gettext-devel pkg-config intltool
- gnome-doc-utils gobject-introspection"
+version=1.8.0
+revision=1
+hostmakedepends="which automake gettext-devel pkg-config intltool
+ gnome-doc-utils gnome-common>=3.7.4 gobject-introspection>=1.36.0_2"
 makedepends="clutter-devel>=1.14 GConf-devel libcanberra-devel libXxf86vm-devel
- startup-notification-devel gsettings-desktop-schemas-devel>=3.6.0 zenity"
+ libSM-devel startup-notification-devel gsettings-desktop-schemas-devel>=3.8 zenity"
 short_desc="The Cinnamon window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -21,12 +21,11 @@ do_fetch() {
 }
 
 pre_configure() {
-	autoreconf -fi
+	./autogen.sh
 }
 
 do_configure() {
-	CFLAGS="$CFLAGS -Wno-error=switch" \
-		./configure ${CONFIGURE_SHARED_ARGS} --disable-static
+	./configure ${CONFIGURE_SHARED_ARGS} --disable-static
 }
 
 do_build() {
@@ -38,7 +37,7 @@ do_install() {
 }
 
 libmuffin_package() {
-	short_desc="${short_desc} -- runtime library"
+	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 		vmove "usr/lib/muffin/*.typelib"
@@ -47,7 +46,7 @@ libmuffin_package() {
 
 libmuffin-devel_package() {
 	depends="libmuffin-${version}_${revision}"
-	short_desc="${short_desc} - development files"
+	short_desci+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -58,6 +57,6 @@ libmuffin-devel_package() {
 muffin_package() {
 	depends="zenity desktop-file-utils gsettings-desktop-schemas>=3.6.0"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }