diff --git a/srcpkgs/libXpm/libXpm-devel.template b/srcpkgs/libXpm/libXpm-devel.template
index 2f0354f62ea..2d4744b90ec 100644
--- a/srcpkgs/libXpm/libXpm-devel.template
+++ b/srcpkgs/libXpm/libXpm-devel.template
@@ -1,11 +1,7 @@
 # Template file for 'libXpm-devel'.
 #
-depends="libX11-devel libXpm"
+depends="libX11-devel libXpm>=${version}"
 short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXpm/template b/srcpkgs/libXpm/template
index 1aad9a1f50c..088012599d8 100644
--- a/srcpkgs/libXpm/template
+++ b/srcpkgs/libXpm/template
@@ -1,20 +1,17 @@
 # Template build file for 'libXpm'.
 pkgname=libXpm
 version=3.5.10
-homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config xproto libICE-devel libSM-devel libX11-devel libXext-devel libXt-devel"
 revision=1
+subpackages="$pkgname-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="xproto libSM-devel libXext-devel libXt-devel"
 short_desc="X PixMap Library from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="${XORG_SITE}"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 long_desc="
  XPM (X PixMap) is a format for storing and retrieving X pixmaps
- to and from files.
-
- This libXpm is from the modular Xorg X11."
-
-subpackages="$pkgname-devel"
-
+ to and from files."