diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 9ce1725b15cc..4ced88ffc681 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -1,45 +1,46 @@
 # New ports collection makefile for:	skkinput
 # Date created:		28 Jan 1998
 # Whom:			Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	skkinput
-PORTVERSION=	2.05
+PORTVERSION=	2.06.1
+PORTCOMMENT=	An SKK-like Japanese input method for X11
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://downloads.sourceforge.jp/skkinput2/864/
+MASTER_SITES=	http://downloads.sourceforge.jp/skkinput2/1445/
 
 MAINTAINER=	koma2@jiro.c.u-tokyo.ac.jp
 
 USE_IMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
 # sanity check
 .if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV)
 .error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously.
 .endif
 
 .if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV)
 RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb
 .elif defined(WITH_RSKKSERV) || exists(${LOCALBASE}/libexec/rskkserv) && !defined(WITH_DBSKKD)
 RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv
 .else
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
 .endif
 
 MANLANG=	"" ja
 MAN1=		skkinput.1
 MANCOMPRESSED=	yes
 
 DOCS=		*.jis ChangeLog skkinput.doc \
 		myeval/skkinputlisp.doc dot.skkinput
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@( cd ${WRKSRC} ; ${INSTALL_DATA} ${DOCS} ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/skkinput/distinfo b/japanese/skkinput/distinfo
index 92698e2c889c..ca954e938290 100644
--- a/japanese/skkinput/distinfo
+++ b/japanese/skkinput/distinfo
@@ -1 +1 @@
-MD5 (skkinput-2.05.tar.gz) = a3f521a4391d31ce685a7d5d9f21391f
+MD5 (skkinput-2.06.1.tar.gz) = 076d851585e58717b6c0d9a55d32c70f
diff --git a/japanese/skkinput/pkg-comment b/japanese/skkinput/pkg-comment
deleted file mode 100644
index 37f1278cc7e9..000000000000
--- a/japanese/skkinput/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A SKK-like Japanese input method for X11
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index 73bd23ae71cc..f622100e3684 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -1,46 +1,47 @@
 # New ports collection makefile for:	skkinput3
 # Date created:		Aug 14 2002
 # Whom:			KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	skkinput3
 PORTVERSION=	${SRCVERSION}.${PATCHLEVEL}
+PORTCOMMENT=	An SKK-like Japanese input method for X11
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://downloads.sourceforge.jp/skkinput3/857/
+MASTER_SITES=	http://downloads.sourceforge.jp/skkinput3/1504/
 DISTNAME=	skkinput-${SRCVERSION}_${PATCHLEVEL}
 
 MAINTAINER=	koma2@jiro.c.u-tokyo.ac.jp
 
 USE_IMAKE=		yes
 
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.pre.mk>
 
 # sanity check
 .if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV)
 .error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously.
 .endif
 
 .if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV)
 RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb
 .elif defined(WITH_RSKKSERV) || exists(${LOCALBASE}/libexec/rskkserv) && !defined(WITH_DBSKKD)
 RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv
 .else
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
 .endif
 
 SRCVERSION=	3.0
-PATCHLEVEL=	1
+PATCHLEVEL=	3.1
 
 DOCS=		*.jis dot.skkinput
 
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/skkinput3/distinfo b/japanese/skkinput3/distinfo
index 9e5fcacd81ae..547f64cbf18c 100644
--- a/japanese/skkinput3/distinfo
+++ b/japanese/skkinput3/distinfo
@@ -1 +1 @@
-MD5 (skkinput-3.0_1.tar.gz) = 5c082ae83bf6dd0b806cdad98b1ae6af
+MD5 (skkinput-3.0_3.1.tar.gz) = 7bdf1f8beaba5ffa6eb2ea5dc31f7c5b
diff --git a/japanese/skkinput3/pkg-comment b/japanese/skkinput3/pkg-comment
deleted file mode 100644
index 8d1da3468f30..000000000000
--- a/japanese/skkinput3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An SKK-like Japanese input method for X11