diff --git a/japanese/chasen/Makefile b/japanese/chasen/Makefile
index 3c33169c54db..307b7baa0c7f 100644
--- a/japanese/chasen/Makefile
+++ b/japanese/chasen/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	chasen
-# Version required:	2.0 + 2.0
+# Version required:	2.02 + 2.1
 # Date created:		21 October 1998
 # Whom:			kuriyama
 #
@@ -7,18 +7,32 @@
 # $FreeBSD$
 #
 
-DISTNAME=	chasen-sys2.0-ipadic2.0
-PKGNAME=	ja-chasen-2.0
+DISTNAME=	chasen-sys2.02-ipadic2.1
+PKGNAME=	ja-chasen-2.02
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/lab/nlp/tools/chasen/ \
 		http://cactus.aist-nara.ac.jp/~akira-k/cha/arc/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/chasen-2.0
+USE_PERL5=	YES
+
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		Text::ChaSen.3
+
+WRKSRC=		${WRKDIR}/chasen-2.02
+
+do-configure:
 
 post-build:
-	${ECHO_MSG} "Making dictionaries"
-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} dic)
+	@${ECHO_MSG} "Making dictionaries"
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} dic
+	@${ECHO_MSG} "Making perl5 module"
+	@cd ${WRKSRC}/perl; \
+		${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL; \
+		${SETENV} ${MAKE_ENV} ${MAKE}
+
+post-install:
+	@cd ${WRKSRC}/perl; ${SETENV} ${MAKE_ENV} ${MAKE} install
 
 .include <bsd.port.mk>
diff --git a/japanese/chasen/distinfo b/japanese/chasen/distinfo
index 9a082b9e0e97..17052d6d142b 100644
--- a/japanese/chasen/distinfo
+++ b/japanese/chasen/distinfo
@@ -1 +1 @@
-MD5 (chasen-sys2.0-ipadic2.0.tar.gz) = ea890ba0bf21da6436eb9f7bfdbf74ce
+MD5 (chasen-sys2.02-ipadic2.1.tar.gz) = d0f05a0f348205f751fa6f3d1f333710
diff --git a/japanese/chasen/files/patch-aa b/japanese/chasen/files/patch-aa
index 95aed29893f8..6904f729e55c 100644
--- a/japanese/chasen/files/patch-aa
+++ b/japanese/chasen/files/patch-aa
@@ -1,12 +1,24 @@
-$NetBSD: patch-aa,v 1.2 1999/06/07 09:54:39 sakamoto Exp $
---- ./Makefile.orig	Thu Apr 22 17:08:15 1999
-+++ ./Makefile	Mon Jun  7 18:09:47 1999
-@@ -17,6 +17,6 @@
+--- Makefile~	Wed Dec 29 01:12:01 1999
++++ Makefile	Sun Feb 27 00:10:30 2000
+@@ -9,8 +9,8 @@
+ #
  
- # --- install directories
+ # --- commands & flags
+-CC	 = gcc
+-CFLAGS	 = -O2
++#CC	 = gcc
++#CFLAGS	 = -O2
+ CCOUT    = 
+ LDFLAGS  =
+ RM       = rm -f
+@@ -19,8 +19,8 @@
+ 
+ # --- installation files and directories
+ CHASEN = chasen
 -BINDIR = /usr/local/bin
 -LIBDIR = /usr/local/lib/chasen
 +BINDIR = $(PREFIX)/bin
 +LIBDIR = $(PREFIX)/share/chasen
  MKDICDIR = $(LIBDIR)/mkchadic
  DICDIR = $(LIBDIR)/dic
+ 
diff --git a/japanese/chasen/files/patch-ab b/japanese/chasen/files/patch-ab
index 4795d5fbbf6e..5d31a665936a 100644
--- a/japanese/chasen/files/patch-ab
+++ b/japanese/chasen/files/patch-ab
@@ -1,13 +1,11 @@
---- dic/Makefile.orig	Sat Dec  4 02:41:42 1999
-+++ dic/Makefile	Fri Dec 17 20:45:04 1999
-@@ -46,8 +46,8 @@
- 	else exit 0; fi
+--- chasen/Makefile~	Fri Dec 17 02:53:09 1999
++++ chasen/Makefile	Sun Feb 27 00:11:55 2000
+@@ -5,7 +5,7 @@
  
- table.cha matrix.cha: $(CONNECT_VCHA)
--	@if [ -f $< ]; then set -x; \
--	  $(CP) $< $(CONNTMP2_VCHA); \
-+	@if [ -f ${.ALLSRC} ]; then set -x; \
-+	  $(CP) ${.ALLSRC} $(CONNTMP2_VCHA); \
- 	  $(CC) -E $(CONNTMP2_VCHA) > $(CONNTMP_VCHA); \
- 	  $(RM) $(CONNTMP2_VCHA); \
- 	  $(MKDICDIR)/makemat; \
+ CP      = cp
+ SHELL   = /bin/sh
+-BINDIR  = /usr/local/bin
++BINDIR  = $(PREFIX)/bin
+ RM      = rm -f
+ 
+ LIBDIR = ../lib
diff --git a/japanese/chasen/files/patch-ac b/japanese/chasen/files/patch-ac
new file mode 100644
index 000000000000..c5721618a196
--- /dev/null
+++ b/japanese/chasen/files/patch-ac
@@ -0,0 +1,11 @@
+--- dic/Makefile~	Wed Dec 29 11:19:41 1999
++++ dic/Makefile	Sun Feb 27 00:12:25 2000
+@@ -16,7 +16,7 @@
+ TABLE         = table.cha
+ MATRIX        = matrix.cha
+ SHELL         = /bin/sh
+-LIBDIR        = /usr/local/lib/chasen
++LIBDIR        = $(PREFIX)/share/chasen
+ DICDIR        = $(LIBDIR)/dic
+ MAKEINT       = makeint
+ MAKE          = make
diff --git a/japanese/chasen/files/patch-ad b/japanese/chasen/files/patch-ad
new file mode 100644
index 000000000000..20ebc84aad0b
--- /dev/null
+++ b/japanese/chasen/files/patch-ad
@@ -0,0 +1,11 @@
+--- mkchadic/Makefile~	Fri Dec 17 02:52:59 1999
++++ mkchadic/Makefile	Sun Feb 27 00:13:05 2000
+@@ -5,7 +5,7 @@
+ CP      = cp
+ MV      = mv -f
+ SHELL   = /bin/sh
+-LIBDIR  = /usr/local/lib/chasen
++LIBDIR  = $(PREFIX)/share/chasen
+ 
+ MKDICDIR = $(LIBDIR)/mkchadic
+ LIBDIR = ../lib
diff --git a/japanese/chasen/files/patch-ae b/japanese/chasen/files/patch-ae
new file mode 100644
index 000000000000..be4a1418c667
--- /dev/null
+++ b/japanese/chasen/files/patch-ae
@@ -0,0 +1,9 @@
+--- perl/Makefile.PL~	Wed Aug 18 15:58:18 1999
++++ perl/Makefile.PL	Sun Feb 27 00:19:08 2000
+@@ -3,5 +3,5 @@
+ WriteMakefile(
+ 	      'NAME' => 'Text::ChaSen',
+ 	      'VERSION_FROM' => 'ChaSen.pm',
+-	      'LIBS' => ['-lchasen']
++	      'LIBS' => ['-L../lib -lchasen']
+ );
diff --git a/japanese/chasen/files/patch-af b/japanese/chasen/files/patch-af
new file mode 100644
index 000000000000..7b919327cfa1
--- /dev/null
+++ b/japanese/chasen/files/patch-af
@@ -0,0 +1,13 @@
+--- perl/ChaSen.pm	Thu Aug 19 17:20:15 1999
++++ perl/ChaSen.pm	Sun Feb 27 02:05:45 2000
+@@ -11,8 +11,8 @@
+ 
+  use Text::ChaSen;
+ 
+- $res = chasen::getopt_argv('chasen-perl', '-j', '-F', '%m ');
+- $str = chasen::sparse_tostr("日本語の文字列");
++ $res = Text::ChaSen::getopt_argv('chasen-perl', '-j', '-F', '%m ');
++ $str = Text::ChaSen::sparse_tostr("日本語の文字列");
+ 
+ =head1 DESCRIPTION
+ 
diff --git a/japanese/chasen/pkg-plist b/japanese/chasen/pkg-plist
index 6b3674603b98..f56e2b6f9e64 100644
--- a/japanese/chasen/pkg-plist
+++ b/japanese/chasen/pkg-plist
@@ -1,8 +1,15 @@
 @comment $NetBSD: PLIST,v 1.2 1999/06/07 09:54:39 sakamoto Exp $
 bin/chasen
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/ChaSen.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/ChaSen 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
 share/chasen/dic/Makefile
 share/chasen/dic/cforms.cha
-share/chasen/dic/chadic.ary
 share/chasen/dic/chadic.int
 share/chasen/dic/chadic.pat
 share/chasen/dic/chasenrc