diff --git a/textproc/xpdf/Makefile b/textproc/xpdf/Makefile
index 87c85ed0f23..811872ddb49 100644
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@@ -1,19 +1,20 @@
-# $OpenBSD: Makefile,v 1.76 2010/11/20 19:56:52 espie Exp $
+# $OpenBSD: Makefile,v 1.77 2010/12/04 10:44:31 miod Exp $
 
 COMMENT-main=	PDF viewer for X11
 COMMENT-utils=	PDF conversion tools
 
 DISTNAME=	xpdf-3.02
-PKGNAME-main=	xpdf-3.02.4
-REVISION-main=	3
-PKGNAME-utils=	xpdf-utils-3.02.4
+PKGNAME-main=	xpdf-3.02.5
+REVISION-main=	0
+PKGNAME-utils=	xpdf-utils-3.02.5
 CATEGORIES=	textproc x11
 
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		ftp://gd.tuwien.ac.at/publishing/xpdf/ \
 		ftp://tug.org/xpdf/
 PATCHFILES=	xpdf-3.02pl1.patch xpdf-3.02pl2.patch \
-		xpdf-3.02pl3.patch xpdf-3.02pl4.patch
+		xpdf-3.02pl3.patch xpdf-3.02pl4.patch \
+		xpdf-3.02pl5.patch
 PATCH_DIST_STRIP=-p1
 
 HOMEPAGE=	http://www.foolabs.com/xpdf/
@@ -28,7 +29,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_MOTIF=	openmotif
 USE_GMAKE=	Yes
-USE_GROFF =	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+= --enable-multithreaded \
 		 --without-Sgm-library \
diff --git a/textproc/xpdf/distinfo b/textproc/xpdf/distinfo
index da8c65bb45e..c392e260cf0 100644
--- a/textproc/xpdf/distinfo
+++ b/textproc/xpdf/distinfo
@@ -3,23 +3,28 @@ MD5 (xpdf-3.02pl1.patch) = h3EYeG3+J9G3qlpnWcxuRQ==
 MD5 (xpdf-3.02pl2.patch) = OlyxZa5meB4LIeYhmuBnlQ==
 MD5 (xpdf-3.02pl3.patch) = WBlj7eD7VxXhpp8BtbjOYw==
 MD5 (xpdf-3.02pl4.patch) = cLdScWeY3TQaS/iQ319v3A==
+MD5 (xpdf-3.02pl5.patch) = UEkCyl6dZsZ+7QNjbsaxYw==
 RMD160 (xpdf-3.02.tar.gz) = 6QDLhnC4xDC+qkWJX7R0QRyxlY0=
 RMD160 (xpdf-3.02pl1.patch) = XDEPlnYPcunBBisAxXwu0DWsZ1c=
 RMD160 (xpdf-3.02pl2.patch) = ACTj0gPWngc6RYVwzsVnniYK0gQ=
 RMD160 (xpdf-3.02pl3.patch) = hZ7DEx08RSamB17mOcXrcEGUIRs=
 RMD160 (xpdf-3.02pl4.patch) = QoBl6Mljm2eZcFsha+YD9S77iiI=
+RMD160 (xpdf-3.02pl5.patch) = 9QKnxTEek18+Sl/Vt3C0TmjAmno=
 SHA1 (xpdf-3.02.tar.gz) = +ZQGmIQMioBFZ36L5oq4WAkD4go=
 SHA1 (xpdf-3.02pl1.patch) = zTyO1uH9NgYJi4XVzIp9GqMFJm0=
 SHA1 (xpdf-3.02pl2.patch) = 0ILr4NNsrQwEYDlQIW9cUt4cJZM=
 SHA1 (xpdf-3.02pl3.patch) = I/SWgEgCo9pTDx0Lq4lLrj6Tj8I=
 SHA1 (xpdf-3.02pl4.patch) = GqMIehx4gohK59OlAiQKVazKZf0=
+SHA1 (xpdf-3.02pl5.patch) = Cs1J5zu6R/oex7R5648TmKM+q7w=
 SHA256 (xpdf-3.02.tar.gz) = szp9VvRUwzGuUJlvmJ6GyRZuV6+Xt03ijN3z1RrBHwA=
 SHA256 (xpdf-3.02pl1.patch) = WPYTsAtBSoaqd2t2/NiZu0FeTuTtwhhMinxO0QBNu/M=
 SHA256 (xpdf-3.02pl2.patch) = 0cHYh7C4pSg/BPgl5E8IXy6S2ve1GIiazxvInqB+2dk=
 SHA256 (xpdf-3.02pl3.patch) = WUzo+9I7/ynqzd+uNTPGPH6GtKJPfUXkTxk309GeU0s=
 SHA256 (xpdf-3.02pl4.patch) = sIRDlUETGHZu91CYd4f3eCMelLwV8E9/fRb0H9WBiLA=
+SHA256 (xpdf-3.02pl5.patch) = kvyzCDoZ43swlpeAQ/rqjHd+eq7KODS4Mtmbwq8xcbo=
 SIZE (xpdf-3.02.tar.gz) = 674912
 SIZE (xpdf-3.02pl1.patch) = 1050
 SIZE (xpdf-3.02pl2.patch) = 20843
 SIZE (xpdf-3.02pl3.patch) = 30727
 SIZE (xpdf-3.02pl4.patch) = 6982
+SIZE (xpdf-3.02pl5.patch) = 1065
diff --git a/textproc/xpdf/patches/patch-fofi_FoFiType1_cc b/textproc/xpdf/patches/patch-fofi_FoFiType1_cc
deleted file mode 100644
index a0054ad6442..00000000000
--- a/textproc/xpdf/patches/patch-fofi_FoFiType1_cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-fofi_FoFiType1_cc,v 1.1 2010/10/13 11:37:25 jasper Exp $
-
-Security fix for CVE-2010-3704. Patch from upstream poppler git:
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=39d140bfc0b8239bdd96d6a55842034ae5c05473
-
---- fofi/FoFiType1.cc.orig	Wed Oct 13 13:18:58 2010
-+++ fofi/FoFiType1.cc	Wed Oct 13 13:21:25 2010
-@@ -18,6 +18,14 @@
- #include "FoFiEncodings.h"
- #include "FoFiType1.h"
- 
-+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-+# define likely(x)      __builtin_expect((x), 1)
-+# define unlikely(x)    __builtin_expect((x), 0)
-+#else
-+# define likely(x)      (x)
-+# define unlikely(x)    (x)
-+#endif
-+
- //------------------------------------------------------------------------
- // FoFiType1
- //------------------------------------------------------------------------
-@@ -224,7 +232,7 @@ void FoFiType1::parse() {
- 		code = code * 8 + (*p2 - '0');
- 	      }
- 	    }
--	    if (code < 256) {
-+	    if (likely(code < 256 && code >= 0)) {
- 	      for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
- 	      if (*p == '/') {
- 		++p;
diff --git a/textproc/xpdf/patches/patch-xpdf_Gfx_cc b/textproc/xpdf/patches/patch-xpdf_Gfx_cc
deleted file mode 100644
index a3aa798d4c6..00000000000
--- a/textproc/xpdf/patches/patch-xpdf_Gfx_cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-xpdf_Gfx_cc,v 1.4 2010/10/13 17:29:37 jasper Exp $
-
-Security fix for CVE-2010-3702.
-Based on patch from upstream poppler git:
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=e853106b58d6b4b0467dbd6436c9bb1cfbd372cf
-
---- xpdf/Gfx.cc.orig	Wed Oct 13 18:58:01 2010
-+++ xpdf/Gfx.cc	Wed Oct 13 18:59:56 2010
-@@ -443,6 +443,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, int pageNum, Di
- 
-   xref = xrefA;
-   subPage = gFalse;
-+  parser = NULL;
-   printCommands = globalParams->getPrintCommands();
- 
-   // start the resource stack
-@@ -485,6 +486,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
- 
-   xref = xrefA;
-   subPage = gTrue;
-+  parser = NULL;
-   printCommands = globalParams->getPrintCommands();
- 
-   // start the resource stack