diff --git a/srcpkgs/poppler/depends b/srcpkgs/poppler/depends
index c5c8dacf8e4..20abab138fc 100644
--- a/srcpkgs/poppler/depends
+++ b/srcpkgs/poppler/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.16.2"
+abi_depends=">=0.18.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/poppler/poppler-cpp-devel.template b/srcpkgs/poppler/poppler-cpp-devel.template
index 10ebf89cee4..5df7533ac9d 100644
--- a/srcpkgs/poppler/poppler-cpp-devel.template
+++ b/srcpkgs/poppler/poppler-cpp-devel.template
@@ -5,18 +5,13 @@ long_desc="${long_desc}
 
  This package contains development files for C++ bindings."
 
-Add_dependency run glibc-devel
 Add_dependency run libstdc++-devel
 Add_dependency run zlib-devel
 Add_dependency run poppler-devel
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig \
-		${DESTDIR}/usr/include/poppler
-	mv ${SRCPKGDESTDIR}/usr/include/poppler/cpp \
-		${DESTDIR}/usr/include/poppler
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-cpp.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/poppler-cpp.pc \
-		${DESTDIR}/usr/lib/pkgconfig
+	vmove usr/include/poppler/cpp usr/include/poppler
+	vmove usr/lib/libpoppler-cpp.a usr/lib
+	vmove usr/lib/pkgconfig/poppler-cpp.pc usr/lib/pkgconfig
 }
diff --git a/srcpkgs/poppler/poppler-cpp.template b/srcpkgs/poppler/poppler-cpp.template
index 8e6172b46d7..0f0f5d7c00f 100644
--- a/srcpkgs/poppler/poppler-cpp.template
+++ b/srcpkgs/poppler/poppler-cpp.template
@@ -8,17 +8,16 @@ long_desc="${long_desc}
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run zlib
+Add_dependency run poppler
 Add_dependency run lcms
-Add_dependency run jpeg
+Add_dependency run tiff
 Add_dependency run libpng
 Add_dependency run libcurl
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run poppler
+Add_dependency run zlib
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-cpp.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libpoppler-cpp.so*" usr/lib
 }
diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template
index 2e3638c529f..6f9ac2c2a23 100644
--- a/srcpkgs/poppler/poppler-devel.template
+++ b/srcpkgs/poppler/poppler-devel.template
@@ -5,24 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run gtk+-devel
-Add_dependency run jpeg-devel
-Add_dependency run lcms-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libpng-devel
-Add_dependency run zlib-devel
-Add_dependency run qt-devel
+Add_dependency run glib-devel
 Add_dependency run poppler
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler.*a ${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
+	vmove usr/lib/libpoppler.a usr/lib
+	vmove usr/lib/pkgconfig/poppler.pc usr/lib/pkgconfig
+	vmove usr/lib/pkgconfig/poppler-splash.pc usr/lib/pkgconfig
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template
index c008b661938..077725e836e 100644
--- a/srcpkgs/poppler/poppler-glib-devel.template
+++ b/srcpkgs/poppler/poppler-glib-devel.template
@@ -5,27 +5,14 @@ long_desc="${long_desc}
 
  This package contains development files for GTK+/Glib bindings."
 
-Add_dependency run pango-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run zlib-devel
-Add_dependency run libstdc++-devel
-Add_dependency run glibc-devel
-Add_dependency run glib-devel
-Add_dependency run cairo-devel
-Add_dependency run gtk+-devel
 Add_dependency run poppler-devel
 Add_dependency run poppler-glib
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig \
-		${DESTDIR}/usr/include/poppler
-	mv ${SRCPKGDESTDIR}/usr/include/poppler/glib \
-		${DESTDIR}/usr/include/poppler
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.*a ${DESTDIR}/usr/lib
-	for f in poppler-cairo poppler-glib; do
-		mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/${f}.pc \
-			${DESTDIR}/usr/lib/pkgconfig
-	done
+	vmove usr/include/poppler/glib usr/include/poppler
+	vmove usr/lib/libpoppler-glib.a usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/lib/pkgconfig/poppler-cairo.pc usr/lib/pkgconfig
+	vmove usr/lib/pkgconfig/poppler-glib.pc usr/lib/pkgconfig
 }
diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template
index 5210ca2af1b..9b630a93aac 100644
--- a/srcpkgs/poppler/poppler-glib.template
+++ b/srcpkgs/poppler/poppler-glib.template
@@ -8,22 +8,19 @@ long_desc="${long_desc}
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run zlib
+Add_dependency run lcms
+Add_dependency run tiff
+Add_dependency run libpng
+Add_dependency run libcurl
 Add_dependency run glib
-Add_dependency run pango
 Add_dependency run cairo
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run libpng
-Add_dependency run lcms
-Add_dependency run jpeg
-Add_dependency run libcurl
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run zlib
 Add_dependency run poppler
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libpoppler-glib.so*" usr/lib
+	vmove usr/lib/girepository-1.0 usr/lib
 }
diff --git a/srcpkgs/poppler/poppler-qt4-devel.template b/srcpkgs/poppler/poppler-qt4-devel.template
index fbb2b476e46..3c9de18e1ec 100644
--- a/srcpkgs/poppler/poppler-qt4-devel.template
+++ b/srcpkgs/poppler/poppler-qt4-devel.template
@@ -5,16 +5,11 @@ long_desc="${long_desc}
 
  This package contains development files for QT 4 bindings."
 
-Add_dependency run glibc-devel
-Add_dependency run libstdc++-devel
-Add_dependency run zlib-devel
-Add_dependency run qt-devel
 Add_dependency run poppler-devel
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove usr/lib/libpoppler-qt4.a usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template
index e3e667dda78..0abf86d4027 100644
--- a/srcpkgs/poppler/poppler-qt4.template
+++ b/srcpkgs/poppler/poppler-qt4.template
@@ -8,18 +8,17 @@ long_desc="${long_desc}
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run zlib
-Add_dependency run fontconfig
+Add_dependency run poppler
 Add_dependency run lcms
-Add_dependency run jpeg
+Add_dependency run tiff
 Add_dependency run libpng
 Add_dependency run libcurl
 Add_dependency run freetype
+Add_dependency run fontconfig
 Add_dependency run qt
-Add_dependency run poppler
+Add_dependency run zlib
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libpoppler-qt4.so*" usr/lib
 }
diff --git a/srcpkgs/poppler/poppler-utils.template b/srcpkgs/poppler/poppler-utils.template
index 509a78109ec..6138624dba0 100644
--- a/srcpkgs/poppler/poppler-utils.template
+++ b/srcpkgs/poppler/poppler-utils.template
@@ -8,10 +8,10 @@ long_desc="${long_desc}
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run zlib
-Add_dependency run fontconfig
-Add_dependency run gtk+
+Add_dependency run lcms
+Add_dependency run freetype
 Add_dependency run cairo
+Add_dependency run gtk+
 Add_dependency run gdk-pixbuf
 Add_dependency run glib
 Add_dependency run poppler
@@ -19,7 +19,6 @@ 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
+	vmove usr/bin usr
+	vmove usr/share/man usr/share
 }
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 6cb3d3a2b1b..cb37fa6ac6b 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -1,13 +1,15 @@
 # Template build file for 'poppler'.
 pkgname=poppler
-version=0.16.2
-distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz"
+version=0.18.0
+homepage="http://poppler.freedesktop.org"
+distfiles="${homepage}/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--enable-zlib --disable-poppler-qt --enable-libcurl
---enable-libjpeg --disable-libopenjpeg --disable-abiword-output"
+configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
+--disable-libopenjpeg"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=aae5ae0a8f1492fe1e0b235b24bc885ce40d202d19384cccc377804144c276cb
+license="GPL-2"
+checksum=9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8
 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.
@@ -25,21 +27,16 @@ subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel"
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run zlib
-Add_dependency run jpeg
-Add_dependency run libpng
 Add_dependency run lcms
+Add_dependency run tiff
+Add_dependency run libpng
+Add_dependency run libcurl
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run libcurl
+Add_dependency run zlib
 
 Add_dependency build pkg-config
 Add_dependency build gtk+-devel
-Add_dependency build jpeg-devel
 Add_dependency build lcms-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libpng-devel
-Add_dependency build zlib-devel
 Add_dependency build qt-devel
 Add_dependency build libcurl-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index f3f7b5303ef..48cf28f2801 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -305,9 +305,10 @@ libMagickCore.so.4		libmagick		libmagick-devel
 libMagickWand.so.4		libmagick		libmagick-devel
 libMagick++.so			libmagick		libmagick-devel
 libltdl.so.7			libltdl			libltdl-devel
-libpoppler-glib.so.6		poppler-glib		poppler-glib-devel
-libpoppler.so.12		poppler			poppler-devel
+libpoppler-glib.so.8		poppler-glib		poppler-glib-devel
+libpoppler.so.18		poppler			poppler-devel
 libpoppler-cpp.so.0		poppler-cpp		poppler-cpp-devel
+libpoppler-qt4.so.3		poppler-qt4		poppler-qt4-devel
 libtcl8.5.so			tcl			tcl-devel
 libsqlite3.so.0			sqlite			sqlite-devel
 libtclsqlite3.so		sqlite-tcl		sqlite-devel