diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 80354e4f294..b5bd4552086 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,9 +1,11 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=1.8.0
+version=1.8.2
 revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
 hostmakedepends="which automake gettext-devel pkg-config intltool
- gnome-doc-utils gnome-common>=3.7.4 gobject-introspection>=1.36.0_2"
+ gnome-doc-utils gnome-common>=3.7.4_2 gobject-introspection>=1.36.0_2"
 makedepends="clutter-devel>=1.14 GConf-devel libcanberra-devel libXxf86vm-devel
  libSM-devel startup-notification-devel gsettings-desktop-schemas-devel>=3.8 zenity"
 short_desc="The Cinnamon window manager"
@@ -24,22 +26,10 @@ pre_configure() {
 	./autogen.sh
 }
 
-do_configure() {
-	./configure ${configure_args} --disable-static
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} install
-}
-
 libmuffin_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 		vmove "usr/lib/muffin/*.typelib"
 	}
 }
@@ -50,12 +40,13 @@ libmuffin-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove "usr/lib/muffin/*.gir"
 	}
 }
 
 muffin_package() {
-	depends="zenity desktop-file-utils gsettings-desktop-schemas>=3.6.0"
+	depends="zenity desktop-file-utils gsettings-desktop-schemas>=3.8"
 	pkg_install() {
 		vmove all
 	}