diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 8229319cb74e..db2e71e47cc5 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -3,20 +3,30 @@
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.19 1998/12/09 10:44:36 vanilla Exp $
+# $Id: Makefile,v 1.20 1998/12/23 01:11:52 steve Exp $
 #
 
 DISTNAME=       xpdf-0.80
 CATEGORIES=	graphics print
-MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/  \
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN} ftp://ftp.foolabs.com/pub/xpdf/  \
 		ftp://ftp.duke.edu/pub/X11/contrib/applications/  \
-		ftp://ftp.cdrom.com/pub/tex/ctan/support/xpdf/
+		${MASTER_SITE_TEX_CTAN}
+MASTER_SITE_SUBDIR=support/xpdf
 EXTRACT_SUFX=	.tgz
 
+.if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING)
+PATCH_SITES=	ftp://ftp.sci.usq.edu.au/pub/linux/xpdf/
+PATCHFILES=	xpdf-0.80-decrypt.patch
+PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+.endfi
+
 MAINTAINER=	chuckr@glue.umd.edu
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
+.if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING)
+RESTRICTED=     "Contains cryptography"
+.endif
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gzip --enable-japanese
diff --git a/graphics/xpdf/distinfo b/graphics/xpdf/distinfo
index 8b107a2d29b0..495a26574d56 100644
--- a/graphics/xpdf/distinfo
+++ b/graphics/xpdf/distinfo
@@ -1 +1,2 @@
 MD5 (xpdf-0.80.tgz) = 91d49cfaf1e555a26a9bcd0b57e51f8a
+MD5 (xpdf-0.80-decrypt.patch) = 97d6648022fcd9633917f8dc96d25fa2
diff --git a/graphics/xpdf/pkg-descr b/graphics/xpdf/pkg-descr
index da1e48e4d940..c27e12e090d5 100644
--- a/graphics/xpdf/pkg-descr
+++ b/graphics/xpdf/pkg-descr
@@ -5,3 +5,5 @@ PDF software.)  Xpdf runs under UNIX and the X Window System.
 Xpdf is designed to be small and efficient.  It does not use the Motif
 or Xt libraries.  It uses standard X fonts.  Xpdf is quite usable on a
 486-66 PC running FreeBSD.
+
+WWW: http://www.foolabs.com/xpdf/