diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index b67c2cd651d..b43932c4e9a 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.60 2012/02/27 18:53:58 kili Exp $
+# $OpenBSD: Makefile,v 1.61 2012/03/27 06:31:05 kili Exp $
 
 COMMENT-main=	PDF rendering library
 COMMENT-qt=	qt interface to PDF rendering library
 COMMENT-qt4=	qt4 interface to PDF rendering library
 
-V=		0.18.2
+V=		0.18.4
 DISTNAME=	poppler-$V
 CATEGORIES=	print
 PKGNAME-main=	poppler-$V
-REVISION-main=	0
 FULLPKGNAME-qt=	poppler-qt-$V
 FULLPKGNAME-qt4=poppler-qt4-$V
 OLDSHIT = poppler-0.16.7
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 5b9bae0ec04..98ef7c35bec 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,10 +1,10 @@
 MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg==
-MD5 (poppler-0.18.2.tar.gz) = OGFpJ4I+8Bk3qrJoculX5A==
+MD5 (poppler-0.18.4.tar.gz) = EmWPMwhZflfz+v9TjMc7rw==
 RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww=
-RMD160 (poppler-0.18.2.tar.gz) = X7Mi95/Zk0EIgYtEiMxvmAO6hiw=
+RMD160 (poppler-0.18.4.tar.gz) = FVMBfpsmDL1iTUPXf89BCvqlfko=
 SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8=
-SHA1 (poppler-0.18.2.tar.gz) = fvTuwg6EkCTAzdeknEKNIOs96HU=
+SHA1 (poppler-0.18.4.tar.gz) = N1PK7Lpxr68p8JfgucUuD4OhClk=
 SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.18.2.tar.gz) = sV9rRh/SulnPmOZHUbom7cSpl2+Jb7IBnYs7GqjJW1I=
+SHA256 (poppler-0.18.4.tar.gz) = M0IRSM3I4EPaKR3s4szhzqYiDUmlDADFbVbWQ1UB1C4=
 SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.18.2.tar.gz) = 1982853
+SIZE (poppler-0.18.4.tar.gz) = 1992993
diff --git a/print/poppler/patches/patch-Makefile_in b/print/poppler/patches/patch-Makefile_in
index c55d8c553ca..0f83d004a79 100644
--- a/print/poppler/patches/patch-Makefile_in
+++ b/print/poppler/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2011/12/10 22:04:12 kili Exp $
---- Makefile.in.orig	Sun Dec  4 15:46:38 2011
-+++ Makefile.in	Fri Dec  9 20:57:20 2011
-@@ -274,6 +274,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+$OpenBSD: patch-Makefile_in,v 1.3 2012/03/27 06:31:05 kili Exp $
+--- Makefile.in.orig	Wed Feb 15 18:22:45 2012
++++ Makefile.in	Mon Mar 26 06:01:36 2012
+@@ -276,6 +276,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
  POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
  POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
  POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/12/10 22:04:12 kili Exp $
  POPPLER_VERSION = @POPPLER_VERSION@
  PTHREAD_CC = @PTHREAD_CC@
  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -329,6 +331,8 @@ infodir = @infodir@
+@@ -331,6 +333,8 @@ infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/12/10 22:04:12 kili Exp $
  localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
-@@ -354,12 +358,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+@@ -356,12 +360,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  @BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
  @BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
  @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/12/10 22:04:12 kili Exp $
  
  # Add CMake buildsystem files here so they get added on make dist
  EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -397,6 +403,7 @@ pkgconfig_DATA = \
+@@ -399,6 +405,7 @@ pkgconfig_DATA = \
  	$(cairo_pc_file)			\
  	$(splash_pc_file)			\
  	$(glib_pc_file)				\
@@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/12/10 22:04:12 kili Exp $
  	$(qt4_pc_file)				\
  	$(cpp_pc_file)
  
-@@ -470,6 +477,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -472,6 +479,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
  poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  poppler-glib-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib-uninstalled.pc.in
diff --git a/print/poppler/patches/patch-configure_ac b/print/poppler/patches/patch-configure_ac
index 086007e7536..494c1232ac6 100644
--- a/print/poppler/patches/patch-configure_ac
+++ b/print/poppler/patches/patch-configure_ac
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.2 2011/12/10 22:04:12 kili Exp $
---- configure.ac.orig	Sun Dec  4 15:43:49 2011
-+++ configure.ac	Fri Dec  9 21:26:12 2011
-@@ -444,6 +444,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+$OpenBSD: patch-configure_ac,v 1.3 2012/03/27 06:31:05 kili Exp $
+--- configure.ac.orig	Wed Feb 15 18:21:50 2012
++++ configure.ac	Mon Mar 26 08:35:40 2012
+@@ -462,6 +462,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
  
  GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
  
@@ -26,16 +26,16 @@ $OpenBSD: patch-configure_ac,v 1.2 2011/12/10 22:04:12 kili Exp $
  dnl 
  dnl Try Qt4
  dnl
-@@ -477,7 +495,7 @@ AC_SUBST(POPPLER_QT4_TEST_LIBS)
+@@ -494,7 +512,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+ AC_SUBST(POPPLER_QT4_TEST_LIBS)
  
  if test x$enable_poppler_qt4 = xyes; then
+-  AC_CHECK_TOOL(MOCQT4, moc)
++  AC_CHECK_TOOL(MOCQT4, moc4)
    AC_MSG_CHECKING([for Qt4 moc])
--  MOCQT4=`which moc`
-+  MOCQT4=`which moc4`
    mocversion=`$MOCQT4 -v 2>&1`
    mocversiongrep=`echo $mocversion | grep "Qt 4"`
-   if test x"$mocversiongrep" != x"$mocversion"; then
-@@ -606,6 +624,9 @@ glib/reference/Makefile
+@@ -626,6 +644,9 @@ glib/reference/Makefile
  glib/reference/version.xml
  glib/demo/Makefile
  test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2011/12/10 22:04:12 kili Exp $
  qt4/Makefile
  qt4/src/Makefile
  qt4/tests/Makefile
-@@ -632,6 +653,7 @@ echo "Building poppler with support for:"
+@@ -652,6 +673,7 @@ echo "Building poppler with support for:"
  echo "  font configuration: $with_font_configuration"
  echo "  splash output:      $enable_splash_output"
  echo "  cairo output:       $enable_cairo_output"
diff --git a/print/poppler/pkg/PLIST-main b/print/poppler/pkg/PLIST-main
index dddbcee1306..86609ac0f9b 100644
--- a/print/poppler/pkg/PLIST-main
+++ b/print/poppler/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.13 2012/02/27 18:53:58 kili Exp $
+@comment $OpenBSD: PLIST-main,v 1.14 2012/03/27 06:31:05 kili Exp $
 @conflict poppler-qt-<0.5.4p0
 @pkgpath print/poppler
 %%SHARED%%
@@ -194,6 +194,7 @@ share/gtk-doc/html/poppler/annotation-glossary.html
 share/gtk-doc/html/poppler/api-index-0-12.html
 share/gtk-doc/html/poppler/api-index-0-14.html
 share/gtk-doc/html/poppler/api-index-0-16.html
+share/gtk-doc/html/poppler/api-index-0-18.html
 share/gtk-doc/html/poppler/api-index-deprecated.html
 share/gtk-doc/html/poppler/api-index-full.html
 share/gtk-doc/html/poppler/ch01.html