diff --git a/japanese/cal.rb/Makefile b/japanese/cal.rb/Makefile
index 5de5a8f59057..32e6c87ddae3 100644
--- a/japanese/cal.rb/Makefile
+++ b/japanese/cal.rb/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cal.rb
-PORTVERSION=	0.2
+PORTVERSION=	0.21
 CATEGORIES=	japanese deskutils
 MASTER_SITES=	http://aglaia.c.u-tokyo.ac.jp/~yamamoto/Script/Calendar/
 DISTFILES=	cal.rb Calendar.rb era_name
-DIST_SUBDIR=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fuyuki@hadaly.org
 
@@ -18,8 +18,6 @@ USE_RUBY=	yes
 RUBY_SHEBANG_FILES=	${WRKSRC}/cal.rb
 NO_BUILD=	yes
 
-LIBDIR=		${PREFIX}/libdata/cal
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for i in ${DISTFILES}
@@ -27,13 +25,15 @@ do-extract:
 .endfor
 
 post-patch:
-	${RUBY} -i -pe 'sub "chdir(.*)", %q{chdir("${LIBDIR}")}' ${WRKSRC}/cal.rb
+	${RUBY} -i -pe 'sub "./era_name", "${DATADIR}/era_name"' \
+		${WRKSRC}/Calendar.rb
+	${RUBY} -i -pe '/Dir::chdir/ and print "#"' \
+		${WRKSRC}/cal.rb
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cal.rb ${PREFIX}/bin
-	${MKDIR} ${LIBDIR}
-.for i in Calendar.rb era_name
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LIBDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/Calendar.rb ${RUBY_SITELIBDIR}
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/era_name ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/cal.rb/distinfo b/japanese/cal.rb/distinfo
index ab118d49b39f..b8734e3d53b6 100644
--- a/japanese/cal.rb/distinfo
+++ b/japanese/cal.rb/distinfo
@@ -1,3 +1,3 @@
-MD5 (cal.rb/cal.rb) = 89a4eabee1e00de929cd944698a9ea7e
-MD5 (cal.rb/Calendar.rb) = b51bb285fde892ccbdedb0ad8d7d53f9
-MD5 (cal.rb/era_name) = 2c3c6a4de0d7d8a2101fbe7165509982
+MD5 (cal.rb-0.21/cal.rb) = d4ef14a378adcf91628ac156cba2396e
+MD5 (cal.rb-0.21/Calendar.rb) = 76fd7a954e26d4ae43f87f721241dd4a
+MD5 (cal.rb-0.21/era_name) = 2c3c6a4de0d7d8a2101fbe7165509982
diff --git a/japanese/cal.rb/pkg-plist b/japanese/cal.rb/pkg-plist
index 97aa9b03bd41..a258b91a6780 100644
--- a/japanese/cal.rb/pkg-plist
+++ b/japanese/cal.rb/pkg-plist
@@ -1,4 +1,4 @@
 bin/cal.rb
-libdata/cal/Calendar.rb
-libdata/cal/era_name
-@dirrm libdata/cal
+%%RUBY_SITELIBDIR%%/Calendar.rb
+%%DATADIR%%/era_name
+@dirrm %%DATADIR%%