diff --git a/textproc/xpdf/Makefile b/textproc/xpdf/Makefile
index 1c5294e4fb0..0b8e5f0e275 100644
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.31 2002/12/29 23:45:20 brad Exp $
+# $OpenBSD: Makefile,v 1.32 2003/02/12 08:28:20 sturm Exp $
 
 COMMENT=	"PDF viewer for X"
 
-DISTNAME=	xpdf-1.01
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	xpdf-2.01
 CATEGORIES=	textproc x11
 
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
@@ -22,6 +21,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
+USE_MOTIF=	openmotif
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-gzip
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include" \
diff --git a/textproc/xpdf/distinfo b/textproc/xpdf/distinfo
index defdd9e571f..cb965d7d52f 100644
--- a/textproc/xpdf/distinfo
+++ b/textproc/xpdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpdf-1.01.tar.gz) = 36d5b3458dfead16e3ec4df6596ec6f9
-RMD160 (xpdf-1.01.tar.gz) = c1737ac9d278e65855afe6d6d9618de0a6c00eb1
-SHA1 (xpdf-1.01.tar.gz) = c02cf4efb90a107364b6f7d20bed45bf8fe09526
+MD5 (xpdf-2.01.tar.gz) = 90326075b7bdabe85dc011882365824c
+RMD160 (xpdf-2.01.tar.gz) = 96081eb4a5ffdc6c2ebc536c96a8f590c7e8436e
+SHA1 (xpdf-2.01.tar.gz) = 9c5633b937496bad9ef14031713e6c45b68b066c
diff --git a/textproc/xpdf/patches/patch-xpdf_GfxState_cc b/textproc/xpdf/patches/patch-xpdf_GfxState_cc
index 4cf3f459c9d..467ec80b480 100644
--- a/textproc/xpdf/patches/patch-xpdf_GfxState_cc
+++ b/textproc/xpdf/patches/patch-xpdf_GfxState_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpdf_GfxState_cc,v 1.1 2002/12/29 23:45:20 brad Exp $
---- xpdf/GfxState.cc.orig	Thu Dec 26 23:05:20 2002
-+++ xpdf/GfxState.cc	Thu Dec 26 23:22:59 2002
-@@ -788,9 +788,19 @@ GfxColorSpace *GfxIndexedColorSpace::par
+$OpenBSD: patch-xpdf_GfxState_cc,v 1.2 2003/02/12 08:28:20 sturm Exp $
+--- xpdf/GfxState.cc.orig	Fri Dec  6 00:44:32 2002
++++ xpdf/GfxState.cc	Tue Feb 11 16:53:52 2003
+@@ -815,9 +815,19 @@ GfxColorSpace *GfxIndexedColorSpace::par
    obj1.free();
    if (!arr->get(2, &obj1)->isInt()) {
      error(-1, "Bad Indexed color space (hival)");
diff --git a/textproc/xpdf/patches/patch-xpdf_Makefile_in b/textproc/xpdf/patches/patch-xpdf_Makefile_in
index 530bab88e03..fbf3a9aba73 100644
--- a/textproc/xpdf/patches/patch-xpdf_Makefile_in
+++ b/textproc/xpdf/patches/patch-xpdf_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-xpdf_Makefile_in,v 1.2 2002/05/23 23:44:21 brad Exp $
---- xpdf/Makefile.in.orig	Tue May 21 02:40:09 2002
-+++ xpdf/Makefile.in	Thu May 23 19:28:16 2002
-@@ -17,7 +17,7 @@ GOOLIBDIR = ../goo
- LTKSRCDIR = $(srcdir)/../ltk
- LTKLIBDIR = ../ltk
+$OpenBSD: patch-xpdf_Makefile_in,v 1.3 2003/02/12 08:28:20 sturm Exp $
+--- xpdf/Makefile.in.orig	Tue Feb 11 16:52:12 2003
++++ xpdf/Makefile.in	Tue Feb 11 16:52:20 2003
+@@ -15,7 +15,7 @@ VPATH = @srcdir@
+ GOOSRCDIR = $(srcdir)/../goo
+ GOOLIBDIR = ../goo
  
--CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @freetype_CFLAGS@ @freetype2_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@
-+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @freetype_CFLAGS@ @freetype2_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_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@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
  
  LDFLAGS = @LDFLAGS@
  
diff --git a/textproc/xpdf/pkg/DESCR b/textproc/xpdf/pkg/DESCR
index 679641179b1..20a2d526c1a 100644
--- a/textproc/xpdf/pkg/DESCR
+++ b/textproc/xpdf/pkg/DESCR
@@ -1,5 +1,5 @@
-Xpdf is a PDF (also known as Acrobat files) for the X window system.
-It includes other pdf programs such as pdftotext, pdftoops, etc.
-Xpdf does not use motif or Xt libraries it only uses standard X fonts.
+Xpdf is an open source viewer for Portable Document Format (PDF) files.
+The Xpdf project also includes a PDF text extractor, PDF-to-PostScript
+converter, and various other utilities.
 
 WWW: ${HOMEPAGE}