diff --git a/templates/poppler-devel b/templates/poppler-devel
new file mode 120000
index 0000000000..5d4379bfb7
--- /dev/null
+++ b/templates/poppler-devel
@@ -0,0 +1 @@
+poppler
\ No newline at end of file
diff --git a/templates/poppler-glib b/templates/poppler-glib
new file mode 120000
index 0000000000..5d4379bfb7
--- /dev/null
+++ b/templates/poppler-glib
@@ -0,0 +1 @@
+poppler
\ No newline at end of file
diff --git a/templates/poppler-glib-devel b/templates/poppler-glib-devel
new file mode 120000
index 0000000000..5d4379bfb7
--- /dev/null
+++ b/templates/poppler-glib-devel
@@ -0,0 +1 @@
+poppler
\ No newline at end of file
diff --git a/templates/poppler-utils b/templates/poppler-utils
new file mode 120000
index 0000000000..5d4379bfb7
--- /dev/null
+++ b/templates/poppler-utils
@@ -0,0 +1 @@
+poppler
\ No newline at end of file
diff --git a/templates/poppler/depends b/templates/poppler/depends
new file mode 100644
index 0000000000..c6525c4313
--- /dev/null
+++ b/templates/poppler/depends
@@ -0,0 +1,2 @@
+abi_depends=0.10.6
+api_depends=${abi_depends}
diff --git a/templates/poppler/devel.template b/templates/poppler/devel.template
new file mode 100644
index 0000000000..d5da480afe
--- /dev/null
+++ b/templates/poppler/devel.template
@@ -0,0 +1,20 @@
+# Template file for 'poppler-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run poppler
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler.so ${DESTDIR}/usr/lib
+	for f in poppler poppler-splash; do
+		mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/${f}.pc \
+			${DESTDIR}/usr/lib/pkgconfig
+	done
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/templates/poppler/glib-devel.template b/templates/poppler/glib-devel.template
new file mode 100644
index 0000000000..6eb0ea785f
--- /dev/null
+++ b/templates/poppler/glib-devel.template
@@ -0,0 +1,22 @@
+# Template file for 'poppler-glib'.
+#
+short_desc="${sourcepkg} GLib bindings (development files)"
+long_desc="${long_desc}
+
+ This package contains files ${sourcepkg} development files for
+ GTK/GLib bindings."
+
+Add_dependency run poppler
+Add_dependency run poppler-glib
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so ${DESTDIR}/usr/lib
+	for f in poppler-cairo poppler-glib; do
+		mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/${f}.pc \
+			${DESTDIR}/usr/lib/pkgconfig
+	done
+}
diff --git a/templates/poppler/glib.template b/templates/poppler/glib.template
new file mode 100644
index 0000000000..305cbcf656
--- /dev/null
+++ b/templates/poppler/glib.template
@@ -0,0 +1,17 @@
+# Template file for 'poppler-glib'.
+#
+short_desc="${sourcepkg} GLib bindings"
+long_desc="${long_desc}
+
+ This package contains files ${sourcepkg} GTK/GLib bindings."
+
+Add_dependency run poppler
+Add_dependency run glib
+Add_dependency run cairo
+Add_dependency run gtk+
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so.* ${DESTDIR}/usr/lib
+}
diff --git a/templates/poppler/template b/templates/poppler/template
index 23a52b13a2..b769a30ad1 100644
--- a/templates/poppler/template
+++ b/templates/poppler/template
@@ -1,17 +1,14 @@
 # Template build file for 'poppler'.
 pkgname=poppler
-version=0.10.0
-distfiles="
-http://poppler.freedesktop.org/$pkgname-$version.tar.gz"
+sourcepkg=$pkgname
+version=0.10.6
+distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4
- --enable-libjpeg"
-pkgconfig_override="poppler.pc poppler-splash.pc poppler-cairo.pc
- poppler-glib.pc"
+ --enable-libjpeg --disable-libopenjpeg --disable-abiword-output"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=068a4f895e39635b628f0a21f4420bbf162ebeca
+checksum=bcd78d674c4166af069afdb27af810c012e13cfd2b7b21f9dce63dd3f62bded1
 long_desc="
  This is poppler, a PDF rendering library. It is a fork of the xpdf
  3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC.
@@ -21,3 +18,16 @@ long_desc="
  effort. And the poppler developers would like to move libpoppler
  forward in a number of areas that doesn't fit within the goals of
  xpdf."
+
+subpackages="devel glib glib-devel utils"
+Add_dependency build pkg-config
+Add_dependency full glibc
+Add_dependency full expat
+Add_dependency full jpeg
+Add_dependency full lcms
+Add_dependency full freetype
+Add_dependency full fontconfig
+Add_dependency build glib
+Add_dependency build cairo
+Add_dependency build gtk+
+Add_dependency run  gcc-libstdc++
diff --git a/templates/poppler/utils.template b/templates/poppler/utils.template
new file mode 100644
index 0000000000..1176fca908
--- /dev/null
+++ b/templates/poppler/utils.template
@@ -0,0 +1,16 @@
+# Template file for 'poppler-utils'.
+#
+short_desc="${sourcepkg} utilities"
+long_desc="${long_desc}
+
+ This package contains files ${sourcepkg} utilities."
+
+Add_dependency run poppler
+Add_dependency run poppler-glib
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share
+}