diff --git a/srcpkgs/liba52/a52dec.template b/srcpkgs/liba52/a52dec.template
deleted file mode 100644
index 9c2986e2522..00000000000
--- a/srcpkgs/liba52/a52dec.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'a52dec'.
-#
-short_desc="ATSC A/52 stream decoder tools"
-long_desc="${long_desc}
-
- This package contains files tools for decoding A/52 (or AC-3) streams."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr || return 1
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr || return 1
-}
diff --git a/srcpkgs/liba52/liba52-devel.template b/srcpkgs/liba52/liba52-devel.template
deleted file mode 100644
index da2371400c3..00000000000
--- a/srcpkgs/liba52/liba52-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'liba52-devel'.
-#
-depends="glibc-devel liba52"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template
index 0557e3ebb4b..d55fe4b6d33 100644
--- a/srcpkgs/liba52/template
+++ b/srcpkgs/liba52/template
@@ -3,14 +3,14 @@ pkgname=liba52
 version=0.7.4
 revision=4
 wrksrc="a52dec-${version}"
-distfiles="http://liba52.sourceforge.net/files/a52dec-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="automake"
+hostmakedepends="automake"
 short_desc="Free ATSC A/52 stream decoder"
 homepage="http://liba52.sourceforge.net/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://liba52.sourceforge.net/files/a52dec-$version.tar.gz"
 checksum=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33
 long_desc="
  liba52 is a free library for decoding ATSC A/52 streams. It is released
@@ -18,9 +18,29 @@ long_desc="
  of applications, including digital television and DVD. It is also known
  as AC-3."
 
-subpackages="$pkgname-devel a52dec"
-
-pre_configure()
-{
-	cd ${wrksrc} && ./bootstrap
+pre_configure() {
+	./bootstrap
+}
+
+a52dec_package() {
+	short_desc="ATSC A/52 stream decoder tools"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}
+
+liba52-devel_package() {
+	depends="liba52>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+liba52_package() {
+	pkg_install() {
+		vmove usr
+	}
 }