diff --git a/srcpkgs/popt/popt-devel.template b/srcpkgs/popt/popt-devel.template
index 61b738fa476..dea52c84820 100644
--- a/srcpkgs/popt/popt-devel.template
+++ b/srcpkgs/popt/popt-devel.template
@@ -1,18 +1,12 @@
 # Template file for 'popt-devel'.
 #
-depends="glibc-devel popt"
-short_desc="popt development files"
-long_desc="${long_desc}
+depends="popt>=${version}"
+short_desc="${short_desc} -- development files"
+noarch=yes
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man/man3 usr/share/man
 	rm -rf ${SRCPKGDESTDIR}/usr/share/man
 }
diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template
index 9c7c8c039cf..aeb460c0af0 100644
--- a/srcpkgs/popt/template
+++ b/srcpkgs/popt/template
@@ -1,19 +1,13 @@
 # Template file for 'popt'
 pkgname=popt
 version=1.16
-distfiles="http://rpm5.org/files/$pkgname/$pkgname-$version.tar.gz"
+revision=3
 build_style=gnu-configure
-configure_args="--disable-rpath"
-revision=2
+subpackages="$pkgname-devel"
+configure_args="--disable-static --disable-rpath"
 short_desc="Command line option parsing library"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://rpm5.org"
+license="MIT"
+distfiles="http://rpm5.org/files/$pkgname/$pkgname-$version.tar.gz"
 checksum=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
-long_desc="
- The popt library exists essentially for parsing command line options.
- Some specific advantages of popt are no global variables (allowing
- multiple passes in parsing argv), parsing an arbitrary array of
- argv-style elements (allowing parsing of command-line-strings from any
- source), a standard method of option aliasing, ability to exec external
- option filters, and automatic generation of help and usage messages."
-
-subpackages="$pkgname-devel"