diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile
new file mode 100644
index 000000000000..cdbff3e48390
--- /dev/null
+++ b/japanese/kinput2-canna+wnn6/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	kinput2-canna+wnn6
+# Version required:	2.0p4
+# Date created:		19 Dec 1997
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-kinput2-canna+wnn6-2.0.4
+CANNA=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../kinput2-wnn4/Makefile"
diff --git a/japanese/kinput2-canna+wnn6/pkg-comment b/japanese/kinput2-canna+wnn6/pkg-comment
new file mode 100644
index 000000000000..6b24282e24fc
--- /dev/null
+++ b/japanese/kinput2-canna+wnn6/pkg-comment
@@ -0,0 +1 @@
+Input server of Japanese text (Canna+Wnn6)
diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr
new file mode 100644
index 000000000000..ecbddc13e5f1
--- /dev/null
+++ b/japanese/kinput2-canna+wnn6/pkg-descr
@@ -0,0 +1,15 @@
+Kinput2 is an input server for X11 applications that want Japanese
+text input.
+
+A client that wants kana-kanji conversion service for Japanese text
+sends a request to kinput2.  Kinput2 receives the request, does
+kana-kanji conversion, and sends the converted text back to the
+client.
+
+The port supports Canna and Wnn6.  Egg key binding is avairable,
+if you run
+
+kinput2 -ccdef ccdef.kinput2.egg
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/kinput2-canna+wnn6/pkg-message b/japanese/kinput2-canna+wnn6/pkg-message
new file mode 100644
index 000000000000..97668d99055e
--- /dev/null
+++ b/japanese/kinput2-canna+wnn6/pkg-message
@@ -0,0 +1,7 @@
+############################################################
+If you want to use Egg key binding on kinput2, then
+you should run
+
+kinput2 -ccdef ccdef.kinput2.egg
+
+############################################################"
diff --git a/japanese/kinput2-canna+wnn6/pkg-plist b/japanese/kinput2-canna+wnn6/pkg-plist
new file mode 100644
index 000000000000..6443168f92e5
--- /dev/null
+++ b/japanese/kinput2-canna+wnn6/pkg-plist
@@ -0,0 +1,17 @@
+bin/kinput2
+lib/X11/app-defaults/Kinput2
+lib/X11/ccdef/ccdef.kinput2
+lib/X11/ccdef/rule.eggfunc
+lib/X11/ccdef/rule.func
+lib/X11/ccdef/rule.greek
+lib/X11/ccdef/rule.kana
+lib/X11/ccdef/rule.kana2
+lib/X11/ccdef/rule.roma
+lib/X11/ccdef/rule.wnnroma
+lib/X11/ccdef/rule.zascii
+lib/X11/ccdef/ccdef.kinput2.egg
+lib/X11/ccdef/rule.hiragana.egg
+lib/X11/ccdef/rule.katakana.egg
+lib/X11/ccdef/rule.kigou.egg
+@dirrm lib/X11/ccdef
+man/man1/kinput2.1.gz
diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile
new file mode 100644
index 000000000000..cdbff3e48390
--- /dev/null
+++ b/japanese/kinput2-canna+wnn7/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	kinput2-canna+wnn6
+# Version required:	2.0p4
+# Date created:		19 Dec 1997
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-kinput2-canna+wnn6-2.0.4
+CANNA=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../kinput2-wnn4/Makefile"
diff --git a/japanese/kinput2-canna+wnn7/pkg-comment b/japanese/kinput2-canna+wnn7/pkg-comment
new file mode 100644
index 000000000000..6b24282e24fc
--- /dev/null
+++ b/japanese/kinput2-canna+wnn7/pkg-comment
@@ -0,0 +1 @@
+Input server of Japanese text (Canna+Wnn6)
diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr
new file mode 100644
index 000000000000..ecbddc13e5f1
--- /dev/null
+++ b/japanese/kinput2-canna+wnn7/pkg-descr
@@ -0,0 +1,15 @@
+Kinput2 is an input server for X11 applications that want Japanese
+text input.
+
+A client that wants kana-kanji conversion service for Japanese text
+sends a request to kinput2.  Kinput2 receives the request, does
+kana-kanji conversion, and sends the converted text back to the
+client.
+
+The port supports Canna and Wnn6.  Egg key binding is avairable,
+if you run
+
+kinput2 -ccdef ccdef.kinput2.egg
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/kinput2-canna+wnn7/pkg-message b/japanese/kinput2-canna+wnn7/pkg-message
new file mode 100644
index 000000000000..97668d99055e
--- /dev/null
+++ b/japanese/kinput2-canna+wnn7/pkg-message
@@ -0,0 +1,7 @@
+############################################################
+If you want to use Egg key binding on kinput2, then
+you should run
+
+kinput2 -ccdef ccdef.kinput2.egg
+
+############################################################"
diff --git a/japanese/kinput2-canna+wnn7/pkg-plist b/japanese/kinput2-canna+wnn7/pkg-plist
new file mode 100644
index 000000000000..6443168f92e5
--- /dev/null
+++ b/japanese/kinput2-canna+wnn7/pkg-plist
@@ -0,0 +1,17 @@
+bin/kinput2
+lib/X11/app-defaults/Kinput2
+lib/X11/ccdef/ccdef.kinput2
+lib/X11/ccdef/rule.eggfunc
+lib/X11/ccdef/rule.func
+lib/X11/ccdef/rule.greek
+lib/X11/ccdef/rule.kana
+lib/X11/ccdef/rule.kana2
+lib/X11/ccdef/rule.roma
+lib/X11/ccdef/rule.wnnroma
+lib/X11/ccdef/rule.zascii
+lib/X11/ccdef/ccdef.kinput2.egg
+lib/X11/ccdef/rule.hiragana.egg
+lib/X11/ccdef/rule.katakana.egg
+lib/X11/ccdef/rule.kigou.egg
+@dirrm lib/X11/ccdef
+man/man1/kinput2.1.gz