diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 0b1f2db13362..41f6bec2b135 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	Wnn7-lib
-PORTVERSION=	98.10.28
+PORTVERSION=	2001.10.17
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
-DISTNAME=	Wnn6-SDK-sources
+MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/
+DISTNAME=	Wnn7SDK
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 .endif
 
-WRKSRC=		${WRKDIR}/src/contrib/im/Xsi
+WRKSRC=		${WRKDIR}/src
 DOCDIR=		${PREFIX}/share/doc/ja-Wnn7-lib
 
 INSTALLS_SHLIB=	yes
@@ -32,9 +33,8 @@ do-build:
 
 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libwnn6_for_wnn7.so.1.0 ${PREFIX}/lib/libwnn6_for_wnn7.so
+	${LN} -sf libwnn7.so.1.0 ${PREFIX}/lib/libwnn7.so
 .endif
-	${LN} -sf libwnn6_for_wnn7_fromsrc.a ${PREFIX}/lib/libwnn6_for_wnn7.a
 	@${MKDIR} ${PREFIX}/include/wnn7/wnn
 	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn7/wnn
 	@${MKDIR} ${DOCDIR}
diff --git a/japanese/Wnn7-lib/distinfo b/japanese/Wnn7-lib/distinfo
index 931e3c42b526..a70a0163fc22 100644
--- a/japanese/Wnn7-lib/distinfo
+++ b/japanese/Wnn7-lib/distinfo
@@ -1 +1 @@
-MD5 (Wnn6-SDK-sources.tar.gz) = 728364fdd1407cf9d3e87c919d5c9c99
+MD5 (Wnn7SDK.tgz) = 19b41bf2ef86d7f4cb889c7f689602fb
diff --git a/japanese/Wnn7-lib/files/patch-aa b/japanese/Wnn7-lib/files/patch-aa
index 87057a51561f..3182fce0935c 100644
--- a/japanese/Wnn7-lib/files/patch-aa
+++ b/japanese/Wnn7-lib/files/patch-aa
@@ -1,63 +1,45 @@
-diff -ur src.orig/contrib/im/Xsi/Wnn/jlib/Imakefile Wnn/jlib/Imakefile
---- src.orig/contrib/im/Xsi/Wnn/jlib/Imakefile	Wed Oct 28 13:36:30 1998
-+++ Wnn/jlib/Imakefile	Fri Oct 30 03:42:54 1998
-@@ -4,7 +4,7 @@
- 
- #ifdef NEED_DEFINE_LIB
- #define DoNormalLib YES
--#define DoSharedLib NO
-+#define DoSharedLib YES
- #define DoDebugLib NO
- #define DoProfileLib NO
- #endif
-@@ -55,13 +55,29 @@
- 	$(WNNROMKANSRC)/rk_vars.o \
- 	$(WNNROMKANSRC)/rk_multi.o
- 
-+UNSHARED_LOCAL_RKOBJS= $(WNNROMKANSRC)/unshared/rk_bltinfn.o \
-+	$(WNNROMKANSRC)/unshared/rk_main.o \
-+	$(WNNROMKANSRC)/unshared/rk_modread.o \
-+	$(WNNROMKANSRC)/unshared/rk_read.o \
-+	$(WNNROMKANSRC)/unshared/rk_vars.o \
-+	$(WNNROMKANSRC)/unshared/rk_multi.o
-+
- LOCAL_ETCSRCS = $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
- LOCAL_ETCOBJS = $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8)
- SRCS= $(SRC1) $(LOCAL_ETCSRCS)
- OBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
-+UNSHAREDOBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
-+
-+
-+SOWNN6LIBREV=1.0
+--- work/src/Wnn/jlib/Imakefile	Wed Oct 17 10:37:17 2001
++++ Wnn/jlib/Imakefile	Sat Oct 19 17:15:25 2002
+@@ -60,9 +60,9 @@
  
  LibraryObjectRule()
-+
-+#if DoSharedLib
-+AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV))
-+#else
- AllTarget($(OBJS) libwnn6_fromsrc.a)
-+#endif
+ #if DoSharedLib
+-AllTarget($(OBJS) libwnn.a libwnn.so.$(SOWNN7LIBREV))
++AllTarget($(OBJS) libwnn7.a libwnn7.so.$(SOWNN7LIBREV))
+ #else
+-AllTarget($(OBJS) libwnn.a)
++AllTarget($(OBJS) libwnn7.a)
+ #endif
  
  
- js.o : js.c \
-@@ -72,10 +88,19 @@
- 
+@@ -75,23 +75,23 @@
  SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
  
--NormalLibraryTarget(wnn6_fromsrc,$(OBJS))
-+
-+#if DoSharedLib
-+SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.)
-+#endif
-+
-+UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..)
- LintLibraryTarget(wnn6_fromsrc,$(SRCS))
+ #if DoSharedLib
+-SharedLibraryTarget(wnn,$(SOWNN7LIBREV),$(OBJS),.,.)
++SharedLibraryTarget(wnn7,$(SOWNN7LIBREV),$(OBJS),.,.)
+ #endif
+-UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..)
+-LintLibraryTarget(wnn,$(SRCS))
++UnsharedLibraryTarget(wnn7,$(UNSHAREDOBJS),unshared,..)
++LintLibraryTarget(wnn7,$(SRCS))
+ 
+ 
  
  instlib:: install
-+
-+#if DoSharedLib
-+InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR))
-+#endif
  
- InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR))
+ #if DoSharedLib
+-InstallSharedLibrary(wnn,$(SOWNN7LIBREV),$(WNNLIBDIR))
++InstallSharedLibrary(wnn7,$(SOWNN7LIBREV),$(WNNLIBDIR))
+ #endif
+-InstallLibrary(wnn,$(WNNLIBDIR))
++InstallLibrary(wnn7,$(WNNLIBDIR))
  
+ #if ProfileLibJlib
+-ProfiledLibraryTarget(wnn,$(OBJS))
+-InstallLibrary(wnn_p,$(WNNLIBDIR))
++ProfiledLibraryTarget(wnn7,$(OBJS))
++InstallLibrary(wnn7_p,$(WNNLIBDIR))
+ #endif
+ 
+ #if DoSharedLib
diff --git a/japanese/Wnn7-lib/files/patch-ab b/japanese/Wnn7-lib/files/patch-ab
index d8555a0c935d..af56ce3974ca 100644
--- a/japanese/Wnn7-lib/files/patch-ab
+++ b/japanese/Wnn7-lib/files/patch-ab
@@ -1,12 +1,43 @@
-diff -ur src.orig/contrib/im/Xsi/Wnn/romkan/Imakefile src/contrib/im/Xsi/Wnn/romkan/Imakefile
---- src.orig/contrib/im/Xsi/Wnn/romkan/Imakefile	Wed Oct 28 13:36:32 1998
-+++ Wnn/romkan/Imakefile	Fri Oct 30 03:25:47 1998
-@@ -4,7 +4,7 @@
- 
- #ifdef NEED_DEFINE_LIB
- #define DoNormalLib YES
--#define DoSharedLib NO
-+#define DoSharedLib YES
- #define DoDebugLib NO
- #define DoProfileLib NO
+--- work/src/config/Project.tmpl.orig	Wed Oct 17 10:37:18 2001
++++ config/Project.tmpl	Sat Oct 19 18:04:30 2002
+@@ -510,7 +510,7 @@
  #endif
+ 
+ #ifndef WnnWnnDir
+-#define WnnWnnDir	/usr/lib/wnn7
++#define WnnWnnDir	/usr/local/lib/wnn7
+ #endif
+ 
+ #ifndef WnnEtcDir
+@@ -522,11 +522,11 @@
+ #endif
+ 
+ #ifndef WnnIncDir
+-#define WnnIncDir	$(INCROOT)
++#define WnnIncDir	/usr/local/include/wnn7
+ #endif
+ 
+ #ifndef WnnLibDir
+-#define WnnLibDir	$(USRLIBDIR)
++#define WnnLibDir	/usr/local/lib
+ #endif
+ 
+ #ifndef WnnVarDir
+@@ -534,7 +534,7 @@
+ #endif
+ 
+ #ifndef WnnShareDir
+-#define WnnShareDir	/usr/share/wnn7
++#define WnnShareDir	/usr/local/share/wnn7
+ #endif
+ 
+        WNNOWNER = WnnOwner
+@@ -599,7 +599,7 @@
+      XWNMOJDSRC = $(XWNMOTOP)/jd
+ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
+-      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
++      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
+       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
+      XCOMMONDIR = $(IMTOP)/XClient/Common/src
diff --git a/japanese/Wnn7-lib/files/patch-ac b/japanese/Wnn7-lib/files/patch-ac
index 9beb9ecd330f..d7726ba511a0 100644
--- a/japanese/Wnn7-lib/files/patch-ac
+++ b/japanese/Wnn7-lib/files/patch-ac
@@ -1,31 +1,43 @@
---- config/X11.tmpl.orig	Wed Oct 28 13:36:37 1998
-+++ config/X11.tmpl	Sun Nov 22 01:24:46 1998
-@@ -417,7 +417,8 @@
+--- work/src/config/X11.tmpl~	Wed Oct 17 10:37:18 2001
++++ config/X11.tmpl	Sat Oct 19 18:08:32 2002
+@@ -510,7 +510,7 @@
+ #endif
  
- #define	WnnSpecialObjectRule(obj, depends, direct, define)	@@\
- obj : depends							@@\
--	$(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c	@@\
-+	(cd unshared ; $(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c)	@@\
-+	$(CC) -c $(CFLAGS) define $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) direct/`basename $@ .o`.c	@@\
+ #ifndef WnnWnnDir
+-#define WnnWnnDir	/usr/lib/wnn7
++#define WnnWnnDir	/usr/local/lib/wnn7
+ #endif
  
- #ifdef	MakeDir
- #undef MakeDir
-@@ -520,7 +521,9 @@
+ #ifndef WnnEtcDir
+@@ -522,11 +522,11 @@
+ #endif
+ 
+ #ifndef WnnIncDir
+-#define WnnIncDir	$(INCROOT)
++#define WnnIncDir	/usr/local/include/wnn7
  #endif
  
  #ifndef WnnLibDir
 -#define WnnLibDir	$(USRLIBDIR)
-+#undef UsrLibDirPath
-+#define UsrLibDirPath	/usr/local/lib
 +#define WnnLibDir	/usr/local/lib
  #endif
  
-        WNNOWNER = WnnOwner
-@@ -660,6 +663,7 @@
- XCOMM for SDK
- #define BuildWnn	YES
- #define BuildJlib	YES
-+#define InstallOnlyJlib	YES
+ #ifndef WnnVarDir
+@@ -534,7 +534,7 @@
+ #endif
  
-  EXTRA_INCLUDES =
-   EXTRA_DEFINES =
+ #ifndef WnnShareDir
+-#define WnnShareDir	/usr/share/wnn7
++#define WnnShareDir	/usr/local/share/wnn7
+ #endif
+ 
+        WNNOWNER = WnnOwner
+@@ -599,7 +599,7 @@
+      XWNMOJDSRC = $(XWNMOTOP)/jd
+ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
+-      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
++      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
+       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
+      XCOMMONDIR = $(IMTOP)/XClient/Common/src
diff --git a/japanese/Wnn7-lib/files/patch-ad b/japanese/Wnn7-lib/files/patch-ad
deleted file mode 100644
index 01622ee24979..000000000000
--- a/japanese/Wnn7-lib/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../Xsi.org/Wnn/Imakefile	Wed Oct 28 13:36:14 1998
-+++ ./Wnn/Imakefile	Sun Nov 22 01:28:58 1998
-@@ -14,7 +14,11 @@
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
- 
-+#if InstallOnlyJlib
-+install::
-+#else
- install:: mkwnndir
-+#endif
- 
- MakeDirectory(mkwnndir, $(DESTDIR)$(WNNWNNDIR))
- MakeDirectory(mkwnndir, $(DESTDIR)$(JWNNWNNDIR))
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-aa b/japanese/Wnn7-lib/files/patch-wnn7-aa
deleted file mode 100644
index bc2a5469d0fc..000000000000
--- a/japanese/Wnn7-lib/files/patch-wnn7-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- Wnn/include/config.h.orig	Wed Oct 28 13:36:24 1998
-+++ Wnn/include/config.h	Wed Jul 18 17:03:05 2001
-@@ -140,7 +140,11 @@
- #define _CONFIG_H_
- 
- #ifndef	LIBDIR
--#define	LIBDIR		"/usr/local/lib/wnn6"
-+#define	LIBDIR		"/usr/lib/wnn7"
-+#endif	/* LIBDIR */
-+
-+#ifndef	SHARDIR
-+#define	SHARDIR		"/usr/share/wnn7"
- #endif	/* LIBDIR */
- 
- #ifdef TAIWANESE
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ab b/japanese/Wnn7-lib/files/patch-wnn7-ab
deleted file mode 100644
index 12ba70b5fb81..000000000000
--- a/japanese/Wnn7-lib/files/patch-wnn7-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/Project.tmpl.~1~	Wed Oct 28 13:36:36 1998
-+++ config/Project.tmpl	Mon Jul 16 02:54:32 2001
-@@ -507,7 +507,7 @@
- #endif
- 
- #ifndef WnnWnnDir
--#define WnnWnnDir	/usr/local/lib/wnn6
-+#define WnnWnnDir	/usr/lib/wnn7
- #endif
- 
- 
-@@ -563,7 +563,7 @@
-    WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir
-     WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
-      WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
--        WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a
-+        WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a
-      WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
- 
-         CWNNTOP = $(IMTOP)/cWnn
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ac b/japanese/Wnn7-lib/files/patch-wnn7-ac
deleted file mode 100644
index 63a197fbaa3f..000000000000
--- a/japanese/Wnn7-lib/files/patch-wnn7-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/X11.tmpl.~1~	Wed Oct 28 13:36:37 1998
-+++ config/X11.tmpl	Mon Jul 16 02:54:53 2001
-@@ -507,7 +507,7 @@
- #endif
- 
- #ifndef WnnWnnDir
--#define WnnWnnDir	/usr/local/lib/wnn6
-+#define WnnWnnDir	/usr/lib/wnn7
- #endif
- 
- 
-@@ -563,7 +563,7 @@
-    WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir
-     WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
-      WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
--        WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a
-+        WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a
-      WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
- 
-         CWNNTOP = $(IMTOP)/cWnn
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ad b/japanese/Wnn7-lib/files/patch-wnn7-ad
deleted file mode 100644
index 3843e87fd0f1..000000000000
--- a/japanese/Wnn7-lib/files/patch-wnn7-ad
+++ /dev/null
@@ -1,39 +0,0 @@
---- Wnn/jlib/Imakefile.~1~	Mon Jul 16 02:58:38 2001
-+++ Wnn/jlib/Imakefile	Mon Jul 16 03:04:20 2001
-@@ -74,9 +74,9 @@
- LibraryObjectRule()
- 
- #if DoSharedLib
--AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV))
-+AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a libwnn6_for_wnn7.so.$(SOWNN6LIBREV))
- #else
--AllTarget($(OBJS) libwnn6_fromsrc.a)
-+AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a)
- #endif
- 
- 
-@@ -90,19 +90,19 @@
- 
- 
- #if DoSharedLib
--SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.)
-+SharedLibraryTarget(wnn6_for_wnn7,$(SOWNN6LIBREV),$(OBJS),.,.)
- #endif
- 
--UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..)
--LintLibraryTarget(wnn6_fromsrc,$(SRCS))
-+UnsharedLibraryTarget(wnn6_for_wnn7_fromsrc,$(UNSHAREDOBJS),unshared,..)
-+LintLibraryTarget(wnn6_for_wnn7_fromsrc,$(SRCS))
- 
- instlib:: install
- 
- #if DoSharedLib
--InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR))
-+InstallSharedLibrary(wnn6_for_wnn7,$(SOWNN6LIBREV),$(WNNLIBDIR))
- #endif
- 
--InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR))
-+InstallLibrary(wnn6_for_wnn7_fromsrc,$(WNNLIBDIR))
- 
- #if ProfileLibJlib
- ProfiledLibraryTarget(wnn,$(OBJS))
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ae b/japanese/Wnn7-lib/files/patch-wnn7-ae
deleted file mode 100644
index f253bc3d6694..000000000000
--- a/japanese/Wnn7-lib/files/patch-wnn7-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- Wnn/jlib/js.c.orig	Wed Oct 28 13:36:31 1998
-+++ Wnn/jlib/js.c	Wed Jul 18 17:14:31 2001
-@@ -953,8 +953,9 @@
-  LockMutex(&msg_lock);
-  if (wnn_msg_cat == NULL){
-     char nlspath[64];
--    strcpy(nlspath, LIBDIR);
--    strcat(nlspath, "/%L/%N");
-+    strcpy(nlspath, SHARDIR);
-+    strcat(nlspath, "/msg");
-+    strcat(nlspath, "/%N");
-     wnn_msg_cat = msg_open("libwnn.msg", nlspath, lang, NULL);
-     if(wnn_msg_cat == NULL){
- 	fprintf(stderr, "libwnn: Can't open message file for libwnn.a\n");
diff --git a/japanese/Wnn7-lib/pkg-comment b/japanese/Wnn7-lib/pkg-comment
index 84b26f29e084..f7990b2517b8 100644
--- a/japanese/Wnn7-lib/pkg-comment
+++ b/japanese/Wnn7-lib/pkg-comment
@@ -1 +1 @@
-Include files and a library of Wnn6
+Include files and a library of Wnn7
diff --git a/japanese/Wnn7-lib/pkg-descr b/japanese/Wnn7-lib/pkg-descr
index af303a3eee23..62561c22991c 100644
--- a/japanese/Wnn7-lib/pkg-descr
+++ b/japanese/Wnn7-lib/pkg-descr
@@ -1,6 +1,6 @@
 This port has include files (e.g. wnn/commonhd.h) and a library file
 (e.g. libwnn.a) to build Wnn7 clients. The files are compiled from
-sources Wnn6-SDK-sources.tar.gz which you can get in
+sources Wnn7SDK.tgz which you can get in
 
 WWW: http://www.omronsoft.co.jp/
 
@@ -18,9 +18,9 @@ from Omron Software Co., Ltd.
 | FAX:     +81-44-246-6011                 |
 +------------------------------------------+
 
-Wnn7 is one of Japanese input methods. 'Wnn7 for Linux/BSD' is
-supported an only Japanese method. However, FreeWnn which is free is
-supported Chinese and Korean ones, too.
+Wnn7 is one of Japanese input methods. 'Wnn7 Personal' 
+supports Japanese method only. However, FreeWnn (which is free)
+supports Chinese and Korean ones, too.
 
 - S. Taoka
 taoka@FreeBSD.org
diff --git a/japanese/Wnn7-lib/pkg-plist b/japanese/Wnn7-lib/pkg-plist
index e5a66b3a4d0e..931d3c471bad 100644
--- a/japanese/Wnn7-lib/pkg-plist
+++ b/japanese/Wnn7-lib/pkg-plist
@@ -1,7 +1,6 @@
 include/wnn7/wnn/commonhd.h
 include/wnn7/wnn/config.h
 include/wnn7/wnn/copyright.h
-include/wnn7/wnn/cplib.h
 include/wnn7/wnn/demcom.h
 include/wnn7/wnn/dslib.h
 include/wnn7/wnn/fi_jdata.h
@@ -14,17 +13,14 @@ include/wnn7/wnn/jllib.h
 include/wnn7/wnn/jslib.h
 include/wnn7/wnn/msg.h
 include/wnn7/wnn/mt_jlib.h
-include/wnn7/wnn/mt_jserver.h
 include/wnn7/wnn/rk_spclval.h
-include/wnn7/wnn/serverdefs.h
 include/wnn7/wnn/wnn_os.h
 include/wnn7/wnn/wnn_string.h
 include/wnn7/wnn/wnnerror.h
 @dirrm include/wnn7/wnn
 @dirrm include/wnn7
-lib/libwnn6_for_wnn7_fromsrc.a
-lib/libwnn6_for_wnn7.a
-lib/libwnn6_for_wnn7.so
-lib/libwnn6_for_wnn7.so.1
+lib/libwnn7.a
+lib/libwnn7.so
+lib/libwnn7.so.1
 share/doc/ja-Wnn7-lib/README
 @dirrm share/doc/ja-Wnn7-lib