diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index 3ed3d90bdf1bd..dd6a5a5a8a027 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:32 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/18 16:28:49 wiz Exp $
 #
 
-DISTNAME=	xpdf-japanese
-PKGNAME=	${DISTNAME}-20020401
-WRKSRC=		${WRKDIR}/${DISTNAME}
+DISTNAME=	xpdf-japanese-2004-jan-16
+PKGNAME=	${DISTNAME}-20040116
+WRKSRC=		${WRKDIR}/xpdf-japanese
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -15,7 +15,6 @@ DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 USE_PKGINSTALL=	yes
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/print/xpdf-japanese/PLIST b/print/xpdf-japanese/PLIST
index fc586e942f1e3..88cb9b22f4766 100644
--- a/print/xpdf-japanese/PLIST
+++ b/print/xpdf-japanese/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:06:57 salo Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/01/18 16:28:49 wiz Exp $
 share/xpdf/japanese/Adobe-Japan1.cidToUnicode
 share/xpdf/japanese/CMap/78-EUC-H
 share/xpdf/japanese/CMap/78-EUC-V
@@ -47,6 +47,8 @@ share/xpdf/japanese/CMap/UniJIS-UCS2-H
 share/xpdf/japanese/CMap/UniJIS-UCS2-HW-H
 share/xpdf/japanese/CMap/UniJIS-UCS2-HW-V
 share/xpdf/japanese/CMap/UniJIS-UCS2-V
+share/xpdf/japanese/CMap/UniJIS-UTF16-H
+share/xpdf/japanese/CMap/UniJIS-UTF16-V
 share/xpdf/japanese/CMap/UniJIS-UTF8-H
 share/xpdf/japanese/CMap/UniJIS-UTF8-V
 share/xpdf/japanese/CMap/UniJISPro-UCS2-HW-V
diff --git a/print/xpdf-japanese/distinfo b/print/xpdf-japanese/distinfo
index 1db8e10984fed..92fb9e901d214 100644
--- a/print/xpdf-japanese/distinfo
+++ b/print/xpdf-japanese/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/03/25 14:06:58 salo Exp $
+$NetBSD: distinfo,v 1.3 2004/01/18 16:28:49 wiz Exp $
 
-SHA1 (xpdf-japanese-20020401/xpdf-japanese.tar.gz) = 056897c3a15708c8bb3702245afed3b70e08dd78
-Size (xpdf-japanese-20020401/xpdf-japanese.tar.gz) = 430457 bytes
+SHA1 (xpdf-japanese-2004-jan-16.tar.gz) = a3dbe2e83aaa81172e6d45f1e88dffc1a0043679
+Size (xpdf-japanese-2004-jan-16.tar.gz) = 494624 bytes