diff --git a/textproc/xpdf/Makefile b/textproc/xpdf/Makefile
index fcb4c364be9..796495f1706 100644
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2003/10/24 19:31:57 brad Exp $
+# $OpenBSD: Makefile,v 1.36 2004/01/25 06:02:40 brad Exp $
 
 COMMENT=	"PDF viewer for X"
 
-DISTNAME=	xpdf-2.02pl1
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	xpdf-3.00
 CATEGORIES=	textproc x11
 
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
@@ -24,7 +23,8 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 USE_MOTIF=	openmotif
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--with-gzip
+CONFIGURE_ARGS+= --enable-multithreaded \
+		 --with-gzip
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
@@ -32,6 +32,6 @@ NO_REGRESS=	Yes
 
 post-install:
 	@cd ${PREFIX}/bin && \
-	  strip pdffonts pdfimages pdfinfo pdftopbm pdftops pdftotext xpdf
+	  strip pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext xpdf
 
 .include <bsd.port.mk>
diff --git a/textproc/xpdf/distinfo b/textproc/xpdf/distinfo
index 1e06fe1cfc7..bcec77a0653 100644
--- a/textproc/xpdf/distinfo
+++ b/textproc/xpdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpdf-2.02pl1.tar.gz) = e2932bb0f844d8318c940350c2aa2eb6
-RMD160 (xpdf-2.02pl1.tar.gz) = e7a9c6a7bca3134ac27355d92aed6ca8d47e5a7f
-SHA1 (xpdf-2.02pl1.tar.gz) = a8b482e49027c6166f7399b8d5f412ddcaef2eb3
+MD5 (xpdf-3.00.tar.gz) = 95294cef3031dd68e65f331e8750b2c2
+RMD160 (xpdf-3.00.tar.gz) = d98668ac8cd059461107c4dfbd9b3fd3beff6176
+SHA1 (xpdf-3.00.tar.gz) = 080317afce0851274fec2865131f59590b54eb99
diff --git a/textproc/xpdf/patches/patch-splash_Makefile_in b/textproc/xpdf/patches/patch-splash_Makefile_in
new file mode 100644
index 00000000000..e138ccbf0fe
--- /dev/null
+++ b/textproc/xpdf/patches/patch-splash_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-splash_Makefile_in,v 1.1 2004/01/25 06:02:40 brad Exp $
+--- splash/Makefile.in.orig	2004-01-24 23:49:23.000000000 -0500
++++ splash/Makefile.in	2004-01-24 23:49:34.000000000 -0500
+@@ -16,7 +16,7 @@ GOOLIBDIR = ../goo
+ FOFISRCDIR = $(srcdir)/../fofi
+ FOFILIBDIR = ../fofi
+ 
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
++CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
+ 
+ CXX = @CXX@
+ AR = @AR@
diff --git a/textproc/xpdf/patches/patch-xpdf_Makefile_in b/textproc/xpdf/patches/patch-xpdf_Makefile_in
index f2f77864d31..5310363d949 100644
--- a/textproc/xpdf/patches/patch-xpdf_Makefile_in
+++ b/textproc/xpdf/patches/patch-xpdf_Makefile_in
@@ -1,12 +1,21 @@
-$OpenBSD: patch-xpdf_Makefile_in,v 1.4 2003/05/20 00:37:10 brad Exp $
---- xpdf/Makefile.in.orig	Sun May 18 21:29:29 2003
-+++ xpdf/Makefile.in	Sun May 18 21:29:43 2003
-@@ -15,7 +15,7 @@ VPATH = @srcdir@
- GOOSRCDIR = $(srcdir)/../goo
- GOOLIBDIR = ../goo
+$OpenBSD: patch-xpdf_Makefile_in,v 1.5 2004/01/25 06:02:40 brad Exp $
+--- xpdf/Makefile.in.orig	2004-01-21 20:26:45.000000000 -0500
++++ xpdf/Makefile.in	2004-01-24 23:55:40.000000000 -0500
+@@ -19,7 +19,7 @@ FOFILIBDIR = ../fofi
+ SPLASHSRCDIR = $(srcdir)/../splash
+ SPLASHLIBDIR = ../splash
  
--CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
-+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
++CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
  
  LDFLAGS = @LDFLAGS@
  
+@@ -32,7 +32,7 @@ SPLASHLIBS = -L$(SPLASHLIBDIR) -lsplash
+ 
+ OTHERLIBS = @LIBS@ @libpaper_LIBS@ \
+ 	-L$(FOFILIBDIR) -lfofi \
+-	-L$(GOOLIBDIR) -lGoo
++	-L$(GOOLIBDIR) -lGoo -pthread
+ 
+ CXX = @CXX@
+ 
diff --git a/textproc/xpdf/patches/patch-xpdf_XPDFCore_cc b/textproc/xpdf/patches/patch-xpdf_XPDFCore_cc
index 5eb1a3c0eab..ab10a757532 100644
--- a/textproc/xpdf/patches/patch-xpdf_XPDFCore_cc
+++ b/textproc/xpdf/patches/patch-xpdf_XPDFCore_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpdf_XPDFCore_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
---- xpdf/XPDFCore.cc.orig	2003-10-23 22:54:49.000000000 -0700
-+++ xpdf/XPDFCore.cc	2003-10-23 22:56:34.000000000 -0700
-@@ -970,9 +970,6 @@ void XPDFCore::moveSelection(int mx, int
+$OpenBSD: patch-xpdf_XPDFCore_cc,v 1.2 2004/01/25 06:02:40 brad Exp $
+--- xpdf/XPDFCore.cc.orig	2004-01-21 20:26:45.000000000 -0500
++++ xpdf/XPDFCore.cc	2004-01-24 23:34:15.000000000 -0500
+@@ -940,9 +940,6 @@ void XPDFCore::moveSelection(int mx, int
  // global variables (currentSelection and currentSelectionOwner).
  
  void XPDFCore::copySelection() {
@@ -11,7 +11,7 @@ $OpenBSD: patch-xpdf_XPDFCore_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
    if (currentSelection) {
      delete currentSelection;
    }
-@@ -1027,9 +1024,6 @@ GBool XPDFCore::getSelection(int *xMin, 
+@@ -997,9 +994,6 @@ GBool XPDFCore::getSelection(int *xMin, 
  }
  
  GString *XPDFCore::extractText(int xMin, int yMin, int xMax, int yMax) {
@@ -21,7 +21,7 @@ $OpenBSD: patch-xpdf_XPDFCore_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
    return out->getText(xMin, yMin, xMax, yMax);
  }
  
-@@ -1038,9 +1032,6 @@ GString *XPDFCore::extractText(int pageN
+@@ -1008,9 +1002,6 @@ GString *XPDFCore::extractText(int pageN
    TextOutputDev *textOut;
    GString *s;
  
@@ -31,7 +31,7 @@ $OpenBSD: patch-xpdf_XPDFCore_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
    textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse);
    if (!textOut->isOk()) {
      delete textOut;
-@@ -1680,11 +1671,7 @@ void XPDFCore::inputCbk(Widget widget, X
+@@ -1649,11 +1640,7 @@ void XPDFCore::inputCbk(Widget widget, X
  #ifndef NO_TEXT_SELECT
  	  if (core->selectXMin != core->selectXMax &&
  	      core->selectYMin != core->selectYMax) {
diff --git a/textproc/xpdf/patches/patch-xpdf_XPDFViewer_cc b/textproc/xpdf/patches/patch-xpdf_XPDFViewer_cc
index 2b75b391562..4b33bd2b0dc 100644
--- a/textproc/xpdf/patches/patch-xpdf_XPDFViewer_cc
+++ b/textproc/xpdf/patches/patch-xpdf_XPDFViewer_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpdf_XPDFViewer_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
---- xpdf/XPDFViewer.cc.orig	2003-10-23 22:55:18.000000000 -0700
-+++ xpdf/XPDFViewer.cc	2003-10-23 22:55:31.000000000 -0700
-@@ -2132,11 +2132,6 @@ void XPDFViewer::printPrintCbk(Widget wi
+$OpenBSD: patch-xpdf_XPDFViewer_cc,v 1.2 2004/01/25 06:02:40 brad Exp $
+--- xpdf/XPDFViewer.cc.orig	2004-01-21 20:26:45.000000000 -0500
++++ xpdf/XPDFViewer.cc	2004-01-24 23:34:15.000000000 -0500
+@@ -2285,11 +2285,6 @@ void XPDFViewer::printPrintCbk(Widget wi
    PSOutputDev *psOut;
  
    doc = viewer->core->getDoc();
diff --git a/textproc/xpdf/patches/patch-xpdf_pdftops_cc b/textproc/xpdf/patches/patch-xpdf_pdftops_cc
index 6bb0b2fc483..af0c18d3b5f 100644
--- a/textproc/xpdf/patches/patch-xpdf_pdftops_cc
+++ b/textproc/xpdf/patches/patch-xpdf_pdftops_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpdf_pdftops_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
---- xpdf/pdftops.cc.orig	2003-10-23 22:55:51.000000000 -0700
-+++ xpdf/pdftops.cc	2003-10-23 22:56:02.000000000 -0700
-@@ -242,13 +242,6 @@ int main(int argc, char *argv[]) {
+$OpenBSD: patch-xpdf_pdftops_cc,v 1.2 2004/01/25 06:02:40 brad Exp $
+--- xpdf/pdftops.cc.orig	2004-01-21 20:26:45.000000000 -0500
++++ xpdf/pdftops.cc	2004-01-24 23:34:15.000000000 -0500
+@@ -266,13 +266,6 @@ int main(int argc, char *argv[]) {
      goto err1;
    }
  
diff --git a/textproc/xpdf/patches/patch-xpdf_pdftotext_cc b/textproc/xpdf/patches/patch-xpdf_pdftotext_cc
index 225a93bb3ae..08f1e50a8af 100644
--- a/textproc/xpdf/patches/patch-xpdf_pdftotext_cc
+++ b/textproc/xpdf/patches/patch-xpdf_pdftotext_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpdf_pdftotext_cc,v 1.1 2003/10/24 19:31:57 brad Exp $
---- xpdf/pdftotext.cc.orig	2003-10-23 22:54:11.000000000 -0700
-+++ xpdf/pdftotext.cc	2003-10-23 22:54:26.000000000 -0700
-@@ -154,13 +154,6 @@ int main(int argc, char *argv[]) {
+$OpenBSD: patch-xpdf_pdftotext_cc,v 1.2 2004/01/25 06:02:40 brad Exp $
+--- xpdf/pdftotext.cc.orig	2004-01-21 20:26:45.000000000 -0500
++++ xpdf/pdftotext.cc	2004-01-24 23:34:15.000000000 -0500
+@@ -160,13 +160,6 @@ int main(int argc, char *argv[]) {
      goto err2;
    }
  
diff --git a/textproc/xpdf/pkg/PLIST b/textproc/xpdf/pkg/PLIST
index d93cb8c0e69..d53703766cd 100644
--- a/textproc/xpdf/pkg/PLIST
+++ b/textproc/xpdf/pkg/PLIST
@@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.6 2002/04/27 04:21:02 brad Exp $
+@comment $OpenBSD: PLIST,v 1.7 2004/01/25 06:02:40 brad Exp $
 bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
-bin/pdftopbm
+bin/pdftoppm
 bin/pdftops
 bin/pdftotext
 bin/xpdf
 man/man1/pdffonts.1
 man/man1/pdfimages.1
 man/man1/pdfinfo.1
-man/man1/pdftopbm.1
+man/man1/pdftoppm.1
 man/man1/pdftops.1
 man/man1/pdftotext.1
 man/man1/xpdf.1