diff --git a/templates/libmng-devel b/templates/libmng-devel
new file mode 120000
index 00000000000..3557150c66d
--- /dev/null
+++ b/templates/libmng-devel
@@ -0,0 +1 @@
+libmng
\ No newline at end of file
diff --git a/templates/libmng/depends b/templates/libmng/depends
new file mode 100644
index 00000000000..8f870118556
--- /dev/null
+++ b/templates/libmng/depends
@@ -0,0 +1,2 @@
+abi_depends=1.0.10
+api_depends=${abi_depends}
diff --git a/templates/libmng/devel.template b/templates/libmng/devel.template
new file mode 100644
index 00000000000..39aa562e111
--- /dev/null
+++ b/templates/libmng/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'libmng-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libmng
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/share/man
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+}
diff --git a/templates/mng/template b/templates/libmng/template
similarity index 60%
rename from templates/mng/template
rename to templates/libmng/template
index ae06255d23b..bfcca79f5a3 100644
--- a/templates/mng/template
+++ b/templates/libmng/template
@@ -1,13 +1,12 @@
-# Template build file for 'mng'.
-pkgname=mng
+# Template build file for 'libmng'.
+pkgname=libmng
+sourcepkg=$pkgname
 version=1.0.10
-wrksrc="libmng-$version"
 distfiles="http://www.libmng.com/download/libmng-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Multiple-image Network Graphics (MNG) reference library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=4a8168f2f1fcfd147e367782c7a664bfe5104fc6
+checksum=7b1477816c54b4d8ee0690c583982637910a1801ece0b0831e03fd07882e8118
 long_desc="
  The libmng library supports decoding, displaying, encoding, and various other
  manipulations of Multiple-image Network Graphics (MNG) format image files.  It
@@ -15,13 +14,17 @@ long_desc="
  Independent JPEG Group (IJG) and/or lcms (little CMS), a color-management
  library by Marti Maria Saguar."
 
+subpackages="devel"
+Add_dependency build automake
+Add_dependency full glibc
+Add_dependency full jpeg
+Add_dependency full zlib
+Add_dependency full lcms
+
 pre_configure()
 {
-	# Automake'ify MNG.
-
-	cd $wrksrc &&   \
-        	$ln_cmd -sf makefiles/configure.in . && \
-        	$ln_cmd -sf makefiles/Makefile.am .
-
-	. $XBPS_TMPLHELPDIR/automake.sh
+	cd $wrksrc
+	ln -s makefiles/configure.in .
+	ln -s makefiles/Makefile.am .
+	autoreconf -f -i
 }