diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index a294f58aee0c..9b5e7b797af2 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -1,90 +1,88 @@
 # New ports collection makefile for:	skk-jisyo
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	skk-jisyo
-PORTVERSION=	200707
+PORTVERSION=	200904
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR= matusita/${PORTNAME}
 .if defined(WITH_SKKJISYO_CDB)
 PKGNAMESUFFIX=	-cdb
 .endif
 DIST_SUBDIR=	skk-jisyo
 
 MAINTAINER?=	matusita@FreeBSD.org
 COMMENT?=	Jisyo (dictionary) files for the SKK Japanese-input software
 
 .if defined(WITH_SKKJISYO_CDB)
-BUILD_DEPENDS=	${LOCALBASE}/bin/cdbmake:${PORTSDIR}/databases/cdb
+BUILD_DEPENDS=	${LOCALBASE}/bin/cdb:${PORTSDIR}/databases/tinycdb
 .endif
 
 SKKDIR?=	share/skk
 SKK_JISYO_TYPE?=L M S
 
 USE_BZIP2=		yes
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 PLIST_SUB+=		SKKDIR=${SKKDIR}
 .for type in ${SKK_JISYO_TYPE}
 DISTFILES+=		SKK-JISYO.${type}.${PORTVERSION}.bz2
 PLIST_FILES+=		${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
 .endfor
 
 .if defined(WITH_SKKJISYO_CDB)
 CDBSUFFIX=		.cdb
 .else
 CDBSUFFIX=		#empty
 NO_BUILD=		yes
 .endif
 
 post-extract:
 	@(cd ${WRKDIR}; ${BZIP2_CMD} -d *.bz2)
 
 .if defined(WITH_SKKJISYO_DELCOMMENTS)
 # Strip comments in transtation candidates list.
 # Candidate list starts with '/', and each candidate is concatinated by
 # '/' (e.g., "/c1/c2/".)  Each candidate may have a comment just after
 # the candidate, leading a marker character ';' (e.g. /c3;comment/).
 do-patch:
 .for type in ${SKK_JISYO_TYPE}
 	${REINPLACE_CMD} -e '/^[^;]/s,;[^/]*/,/,g' \
 		${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}
 .endfor
 .endif
 
 .if defined(WITH_SKKJISYO_CDB)
 # Convert plaintext jisyo data to CDB database by cdbmake.
 # Each line consists of "+${klen},${dlen}:${key}->${data}", where klen/dlen
 # are length of key/data.  A blank line at the end of data is required.
 # See also: <URL:http://cr.yp.to/cdb/cdbmake.html>.
 do-build:
 .for type in ${SKK_JISYO_TYPE}
-	${AWK} '/^[^;]/ { \
-			k = $$1; didx = index($$0, $$2); \
-			d = substr($$0, didx); \
-			print "+" length(k) "," length(d) ":" k "->" d; \
+	LC_ALL=C ${AWK} '/^[^;]/ { \
+			s = substr($$0, index($$0, " ") + 1); \
+			print "+" length($$1) "," length(s) ":" $$1 "->" s; \
 		} \
 		END { \
 			print ""; \
 		}' \
 		< ${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION} | \
-	${LOCALBASE}/bin/cdbmake \
-		${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX} \
-		${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}.tmp
+	${LOCALBASE}/bin/cdb -c -t - \
+		${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX}
 .endfor
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/${SKKDIR}
 .for type in ${SKK_JISYO_TYPE}
 	${INSTALL_DATA} ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX} \
 		${PREFIX}/${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/skk-jisyo/distinfo b/japanese/skk-jisyo/distinfo
index 1af5a4cae8c2..b57a671dc5af 100644
--- a/japanese/skk-jisyo/distinfo
+++ b/japanese/skk-jisyo/distinfo
@@ -1,9 +1,9 @@
-MD5 (skk-jisyo/SKK-JISYO.L.200707.bz2) = c44994443bc6a55d89a3189ff44f6ad4
-SHA256 (skk-jisyo/SKK-JISYO.L.200707.bz2) = dee369fd507826fd07379a97dc6ccd8dad8b330851b7a67e38280aa6715f438d
-SIZE (skk-jisyo/SKK-JISYO.L.200707.bz2) = 1680735
-MD5 (skk-jisyo/SKK-JISYO.M.200707.bz2) = c3c8d7bf8645f8ac88cd255311de220c
-SHA256 (skk-jisyo/SKK-JISYO.M.200707.bz2) = 82801d01d66e89ce8a9dc00516efd646a3acf5b2179aa8588177f9bf2aa2dad4
-SIZE (skk-jisyo/SKK-JISYO.M.200707.bz2) = 62529
-MD5 (skk-jisyo/SKK-JISYO.S.200707.bz2) = 8201d91d4450f628b2badf9092b5cc19
-SHA256 (skk-jisyo/SKK-JISYO.S.200707.bz2) = c5edfca77db156bc61793747849793653acf897661138df2cd6fc644fde84862
-SIZE (skk-jisyo/SKK-JISYO.S.200707.bz2) = 25959
+MD5 (skk-jisyo/SKK-JISYO.L.200904.bz2) = c4ac9aa5b43c89547e6dd1da50d701e4
+SHA256 (skk-jisyo/SKK-JISYO.L.200904.bz2) = b46c396983fffea85fe7663f9e9bf675fe259946b7f6ddc5953ec11698a9a5f3
+SIZE (skk-jisyo/SKK-JISYO.L.200904.bz2) = 1694431
+MD5 (skk-jisyo/SKK-JISYO.M.200904.bz2) = c3c8d7bf8645f8ac88cd255311de220c
+SHA256 (skk-jisyo/SKK-JISYO.M.200904.bz2) = 82801d01d66e89ce8a9dc00516efd646a3acf5b2179aa8588177f9bf2aa2dad4
+SIZE (skk-jisyo/SKK-JISYO.M.200904.bz2) = 62529
+MD5 (skk-jisyo/SKK-JISYO.S.200904.bz2) = 8201d91d4450f628b2badf9092b5cc19
+SHA256 (skk-jisyo/SKK-JISYO.S.200904.bz2) = c5edfca77db156bc61793747849793653acf897661138df2cd6fc644fde84862
+SIZE (skk-jisyo/SKK-JISYO.S.200904.bz2) = 25959