diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index 022c075e8cf1..a578a50794c0 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -6,33 +6,17 @@
 #
 
 PORTNAME=	nkf
-PORTVERSION=	1.92
-PORTREVISION=	1
+PORTVERSION=	2.02
 CATEGORIES=	japanese perl5
-MASTER_SITES=	ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/
+MASTER_SITES=	http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/
 PKGNAMEPREFIX=	ja-p5-
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
-EXTRACT_SUFX=	.shar
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./-/}
 
 MAINTAINER=	max@FreeBSD.org
 
 PERL_CONFIGURE=	yes
-
-EXTRACT_CMD=	${SH}
-EXTRACT_BEFORE_ARGS=	# Empty
-EXTRACT_AFTER_ARGS=	> /dev/null
-WRKSRC=		${WRKDIR}/NKF
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}/NKF.mod
 MAN3=		NKF.3
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}/NKF
-	@for file in ${EXTRACT_ONLY}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
-		then \
-			exit 1; \
-		fi \
-	done
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/japanese/p5-nkf/distinfo b/japanese/p5-nkf/distinfo
index a8f51407ae98..676cdc18f36f 100644
--- a/japanese/p5-nkf/distinfo
+++ b/japanese/p5-nkf/distinfo
@@ -1 +1 @@
-MD5 (nkf192.shar) = 2e560387657d5d7c725875e548394b0f
+MD5 (nkf202.tar.gz) = 5157b91879471b450997f4eec5af62e6
diff --git a/japanese/p5-nkf/files/patch-ab b/japanese/p5-nkf/files/patch-ab
deleted file mode 100644
index e44e2f7b8f5b..000000000000
--- a/japanese/p5-nkf/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../nkf.c.orig	Tue Nov 13 19:31:36 2001
-+++ ../nkf.c	Tue Nov 13 19:34:02 2001
-@@ -1670,6 +1670,7 @@
-        if (0x21==c1) {
-            if (alpha_f&0x2) {
-                c1 = ' ';
-+               c2 = 0;
-            } else if (alpha_f&0x4) {
-                 (*o_zconv)(0,' ');
-                 (*o_zconv)(0,' ');