diff --git a/common/shlibs b/common/shlibs
index 89bd954c27..657e85f9f4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1663,3 +1663,4 @@ libxmlrpc_server_pstream++.so.7 xmlrpc-c-1.25.28_1
 libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libtidy-0.99.so.0 tidy-1.46_2
+libnetpbm.so.11 libnetpbm-10.66.03_2
diff --git a/srcpkgs/libnetpbm b/srcpkgs/libnetpbm
new file mode 120000
index 0000000000..66d3277657
--- /dev/null
+++ b/srcpkgs/libnetpbm
@@ -0,0 +1 @@
+netpbm
\ No newline at end of file
diff --git a/srcpkgs/libnetpbm-devel b/srcpkgs/libnetpbm-devel
new file mode 120000
index 0000000000..66d3277657
--- /dev/null
+++ b/srcpkgs/libnetpbm-devel
@@ -0,0 +1 @@
+netpbm
\ No newline at end of file
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index cda2313057..1ee7c0ae57 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 version=10.66.03
-revision=1
+revision=2
 wrksrc=advanced
-makedepends="pkg-config perl python flex libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel"
-depends=""
+hostmakedepends="pkg-config perl python flex"
+makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel"
 short_desc="Toolkit for manipulation of graphic images"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="BSD,GPL,LGPL,custom"
@@ -21,7 +21,7 @@ do_configure() {
 }
 
 do_build() {
-    make ${makejobs}
+    make CC=$CC CFLAGS="$CFLAGS" ${makejobs}
     make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \
         -C ../doc -f "${PWD}/buildtools/manpage.mk" manpages
 }
@@ -33,3 +33,25 @@ do_install() {
         -C ../doc -f "${PWD}/buildtools/manpage.mk" installman
     vinstall doc/copyright_summary 644 usr/share/licenses/$pkgname
 }
+
+do_clean() {
+	rm -rf ${XBPS_BUILDDIR}/doc
+}
+
+libnetpbm_package() {
+	replaces="${sourcepkg}<10.66.03_2"
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+	}
+}
+
+libnetpbm-devel_package() {
+	replaces="${sourcepkg}<10.66.03_2"
+	depends="libnetpbm>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}