diff --git a/srcpkgs/libmad/libmad-devel.template b/srcpkgs/libmad/libmad-devel.template
index 3cb5cdbf699..0a237ad33ec 100644
--- a/srcpkgs/libmad/libmad-devel.template
+++ b/srcpkgs/libmad/libmad-devel.template
@@ -1,18 +1,14 @@
 # Template file for 'libmad-devel'.
 #
-depends="glibc-devel libmad"
+noarch=yes
+depends="${sourcepkg}-${version}_${revision}"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	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/share ${DESTDIR}/usr
 }
diff --git a/srcpkgs/libmad/template b/srcpkgs/libmad/template
index 111845544ee..29cb5a7b700 100644
--- a/srcpkgs/libmad/template
+++ b/srcpkgs/libmad/template
@@ -1,12 +1,14 @@
 # Template file for 'libmad'
 pkgname=libmad
 version=0.15.1b
-revision=3
-distfiles="${SOURCEFORGE_SITE}/mad/$pkgname-$version.tar.gz"
+revision=4
+subpackages="$pkgname-devel"
 build_style=gnu-configure
+configure_args="--disable-static"
 makedepends="automake"
 short_desc="High-quality MPEG audio decoder"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/mad/$pkgname-$version.tar.gz"
 checksum=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
 long_desc="
  MAD (libmad) is a high-quality MPEG audio decoder. It currently
@@ -31,9 +33,6 @@ long_desc="
  resolution to increase the audible dynamic range through the use
  of dithering or noise shaping."
 
-subpackages="$pkgname-devel"
-
-pre_configure()
-{
-	cd ${wrksrc} && autoconf || return 1
+pre_configure() {
+	autoconf
 }