diff --git a/japanese/onew-wnn4-canna/Makefile b/japanese/onew-wnn4-canna/Makefile
new file mode 100644
index 00000000000..387f4b09121
--- /dev/null
+++ b/japanese/onew-wnn4-canna/Makefile
@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2000/04/29 01:35:07 espie Exp $
+
+DISTNAME=	jvim2.0r+onew2.2.10
+PKGNAME?=	ja-onew-wnn4-canna-2.2.10
+CATEGORIES=	japanese
+NEED_VERSION=	1.230
+FAKE=		Yes
+MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
+		ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/
+
+MAINTAINER=	espie@cvs.openbsd.org
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+BUILD_DEPENDS=	jserver::japanese/Wnn
+LIB_DEPENDS=	canna.1.::japanese/canna
+
+WRKDIST=	${WRKDIR}/onew
+ALL_TARGET=	
+
+ONEW_CONF=	${FILESDIR}/ONEW_CONF-for-wnn4-canna
+LIB_NAME=	libonew-wnn4-canna.a
+PORT_DOCDIR=	${PREFIX}/share/doc/ja-onew-wnn4-canna
+
+post-patch:
+	sed	-e 's,%PREFIX%,${PREFIX},g' \
+		${ONEW_CONF} > ${WRKSRC}/ONEW_CONF
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/libonew.a ${LOCALBASE}/lib/${LIB_NAME}
+	${INSTALL_DATA_DIR} ${PORT_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.ONEW ${PORT_DOCDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/onew-wnn4-canna/files/ONEW_CONF-for-wnn4-canna b/japanese/onew-wnn4-canna/files/ONEW_CONF-for-wnn4-canna
new file mode 100644
index 00000000000..52f1ec9194d
--- /dev/null
+++ b/japanese/onew-wnn4-canna/files/ONEW_CONF-for-wnn4-canna
@@ -0,0 +1,9 @@
+WNNINC		= -I%PREFIX%/include/wnn
+WNNLIB		= -L%PREFIX%/lib -ljd
+WNN_RKPATH      = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%PREFIX%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
+CANNAINC	= -I%PREFIX%/include
+CANNAOBJ	= Canna.o CannaRk.o
+CANNALIB	= -L%PREFIX%/lib -lcanna
+CANNA_RKPATH	= '".:$$HOME:%PREFIX%/lib/canna/dic:/tmp/onew_rktabs/canna"'
+RKKLIBS		= $(CANNALIB) $(WNNLIB)
+RKKOBJS		= $(CANNAOBJ) $(WNNOBJ)
diff --git a/japanese/onew-wnn4-canna/files/md5 b/japanese/onew-wnn4-canna/files/md5
new file mode 100644
index 00000000000..47365b876b3
--- /dev/null
+++ b/japanese/onew-wnn4-canna/files/md5
@@ -0,0 +1,3 @@
+MD5 (jvim2.0r+onew2.2.10.tar.gz) = 42e04a80f3dbdfca4fbe8b9e634d1380
+RMD160 (jvim2.0r+onew2.2.10.tar.gz) = be3ec6688e2372032d3d050b681d7ea3e20bc01f
+SHA1 (jvim2.0r+onew2.2.10.tar.gz) = 546ad6c34024a9528b25533466242470d2db70c2
diff --git a/japanese/onew-wnn4-canna/patches/patch-aa b/japanese/onew-wnn4-canna/patches/patch-aa
new file mode 100644
index 00000000000..29d57e485ed
--- /dev/null
+++ b/japanese/onew-wnn4-canna/patches/patch-aa
@@ -0,0 +1,20 @@
+--- sys/sys.h.orig	Wed Jul 29 02:05:15 1998
++++ sys/sys.h	Wed Jul 29 02:04:37 1998
+@@ -30,7 +30,7 @@
+  || defined(MACH) \
+  || defined(NeXT) \
+  || defined(bsdi) \
+- || defined(__FreeBSD__)
++ || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define USE_SGTTY
+ #define HAS_SELECT
+ #endif
+@@ -69,7 +69,7 @@
+ #define READYCC(fp)	(fp->_egptr - fp->_gptr)
+ #endif
+ #else
+-#if defined(bsdi) || defined(__FreeBSD__)
++#if defined(bsdi) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define READYCC(fp)	(fp->_r)
+ #else
+ #define READYCC(fp)	(fp->_cnt)
diff --git a/japanese/onew-wnn4-canna/patches/patch-ab b/japanese/onew-wnn4-canna/patches/patch-ab
new file mode 100644
index 00000000000..ed80c5495a1
--- /dev/null
+++ b/japanese/onew-wnn4-canna/patches/patch-ab
@@ -0,0 +1,11 @@
+--- sys/regex.c.orig	Wed Jul 29 02:05:30 1998
++++ sys/regex.c	Wed Jul 29 02:04:46 1998
+@@ -35,7 +35,7 @@
+ #else
+ #if defined(hpux) \
+  || defined(bsdi) \
+- || defined(__FreeBSD__)
++ || defined(__FreeBSD__) || defined(__OpenBSD__)
+ 
+ #ifdef bsdi
+ #include <stdio.h>
diff --git a/japanese/onew-wnn4-canna/pkg/COMMENT b/japanese/onew-wnn4-canna/pkg/COMMENT
new file mode 100644
index 00000000000..0f114ab7b65
--- /dev/null
+++ b/japanese/onew-wnn4-canna/pkg/COMMENT
@@ -0,0 +1 @@
+library for Japanese Input Method canna or wnn4
diff --git a/japanese/onew-wnn4-canna/pkg/DESCR b/japanese/onew-wnn4-canna/pkg/DESCR
new file mode 100644
index 00000000000..fc106aa1f2f
--- /dev/null
+++ b/japanese/onew-wnn4-canna/pkg/DESCR
@@ -0,0 +1,4 @@
+ONEW is a library for using Japanese Input Method Canna, Wnn4, or
+Wnn6.
+
+This is the Canna+wnn4 version.
diff --git a/japanese/onew-wnn4-canna/pkg/PLIST b/japanese/onew-wnn4-canna/pkg/PLIST
new file mode 100644
index 00000000000..e7b3af6391c
--- /dev/null
+++ b/japanese/onew-wnn4-canna/pkg/PLIST
@@ -0,0 +1,3 @@
+lib/libonew-wnn4-canna.a
+share/doc/ja-onew-wnn4-canna/README.ONEW
+@dirrm share/doc/ja-onew-wnn4-canna