diff --git a/scim-wnn/ChangeLog b/scim-wnn/ChangeLog
index bb650f9..a8aad8e 100644
--- a/scim-wnn/ChangeLog
+++ b/scim-wnn/ChangeLog
@@ -1,3 +1,110 @@
+2004-12-14 18:59:07  Rev 86     tamra
+
+	* configure.ac po/ja.po po/scim-wnn.pot:
+	  ��꡼��������
+
+2004-12-14 18:59:02  Rev 85     tamra
+
+	* src/scim_wnn_imengine_setup.cpp:
+	  ��꡼��������
+
+2004-12-14 18:13:15  Rev 84     tamra
+
+	* src/wnnproto.h src/scim_wnn_imengine.h src/wnnconversion.h 
+	  src/scim_wnn_def.h src/scim_wnn_imengine.cpp src/wnnconversion.cpp:
+	  FreeWnn�к���Disconnect��Ƥӽ��
+
+2004-12-14 17:41:43  Rev 83     tamra
+
+	* src/scim_wnn_imengine.cpp src/wnnconversion.cpp:
+	  ��Ĵ����
+
+2004-12-14 17:34:17  Rev 82     tamra
+
+	* src/scim_wnn_imengine.cpp:
+	  ��Ĵ����
+
+2004-12-14 17:30:37  Rev 81     tamra
+
+	* src/wnnconversion.cpp:
+	  ��Ĵ����
+
+2004-12-14 17:20:13  Rev 80     tamra
+
+	* src/wnnproto.h src/scim_wnn_imengine.h src/wnnconversion.h 
+	  src/scim_wnn_def.h src/scim_wnn_imengine.cpp src/wnnconversion.cpp:
+	  Wnn�Ȥ���³�ޤ�����Ĵ����
+
+2004-12-14 16:43:12  Rev 79     tamra
+
+	* src/scim_wnn_imengine.cpp:
+	  ����äȤ���������������
+
+2004-12-14 16:31:52  Rev 78     tamra
+
+	* po/ja.po Makefile.am po/scim-wnn.pot:
+	  ��Ĵ����
+
+2004-12-14 16:15:00  Rev 77     tamra
+
+	* src/scim_wnn_imengine.cpp:
+	  �ե��������ڤ��ؤ�����Property����������ʤ��Х�������
+
+2004-12-14 15:36:59  Rev 76     tamra
+
+	* src/romkan_table.h src/romkan.cpp:
+	  ���޻����ϥ⡼�ɤ��餫�����Ͻ�������
+
+2004-12-14 05:41:49  Rev 75     tamra
+
+	* src/romkan_table.h:
+	  ���˥��޻������Ѵ��ơ��֥�η�����䴰��
+
+2004-12-14 03:52:30  Rev 74     tamra
+
+	* src/romkan_table.h:
+	  ���޻������Ѵ��ơ��֥�η�����䴰��
+
+2004-12-13 02:31:00  Rev 73     tamra
+
+	* src/scim_wnn_imengine.cpp:
+	  �Τ�ʤ��������ǤäƤ����餷�����ڡ�������
+
+2004-12-13 01:41:50  Rev 72     tamra
+
+	* src/romkan.h po/ja.po src/scim_wnn_imengine.h src/kanainput.h 
+	  po/POTFILES.in po/scim-wnn.pot src/preeditor.h src/romkan.cpp 
+	  src/scim_wnn_imengine.cpp:
+	  ���ϥ⡼���ڤ��ؤ�������
+
+2004-12-13 00:58:11  Rev 71     tamra
+
+	* src/kanainput.cpp src/romkan.h src/preeditor.cpp 
+	  src/scim_wnn_imengine.h src/kanainput.h src/preeditor.h src/romkan.
+	  cpp src/Makefile.am src/scim_wnn_imengine.cpp:
+	  ��������PreEditor���̥��饹�Ȥ��Ƽ�����
+
+2004-12-10 16:56:34  Rev 70     tamra
+
+	* src/romkan_table.h:
+	  �������ϥޥåפη�����䴰��
+
+2004-12-10 16:24:57  Rev 69     tamra
+
+	* src/romkan_table.h src/romkan.cpp:
+	  �������Ϥ˰���б���
+
+2004-12-10 14:48:28  Rev 68     tamra
+
+	* src/scim_wnn_def.h src/scim_wnn_imengine.cpp:
+	  �ץ�ѥƥ�̾��define��
+
+2004-12-10 14:43:19  Rev 67     tamra
+
+	* po/ja.po src/scim_wnn_imengine.h ChangeLog src/scim_wnn_def.h 
+	  po/scim-wnn.pot src/scim_wnn_imengine.cpp:
+	  �ץ�ѥƥ��˾���ɽ�����ɲá�
+
 2004-12-07 11:17:29  Rev 66     tamra
 
 	* src/romkan.h src/preeditor.cpp src/preeditor.h src/romkan.cpp 
diff --git a/scim-wnn/configure.ac b/scim-wnn/configure.ac
index 80fae92..18d6c2b 100644
--- a/scim-wnn/configure.ac
+++ b/scim-wnn/configure.ac
@@ -68,13 +68,24 @@
 AC_SUBST(SCIM_BUILD_SETUP)
 
 AC_CHECK_LIB(crypt, crypt)
+
 AC_CHECK_LIB(wnn7, jl_yosoku_init,, [AC_MSG_RESULT(libwnn7 not found.)])
 if echo $LIBS | grep -v "wnn7" > /dev/null; then
+  AC_CHECK_LIB(wnn, jl_yosoku_init,, [AC_MSG_RESULT(libwnn for Wnn7 not found.)])
+fi
+
+if echo $LIBS | grep "wnn.*" > /dev/null; then 
+  AC_DEFINE([HAVE_LIBWNN7],1,[])
+else
   AC_CHECK_LIB(wnn6, jl_optimize_fi,, [AC_MSG_RESULT(libwnn6 not found.)])
   if echo $LIBS | grep -v "wnn6" > /dev/null; then
-    AC_CHECK_LIB(wnn, jl_yosoku_init,[AC_DEFINE([HAVE_LIBWNN7],1,[])], [AC_MSG_RESULT(libwnn for Wnn7 not found.)])
-    AC_CHECK_LIB(wnn, jl_optimize_fi,[AC_DEFINE([HAVE_LIBWNN6],1,[])], [AC_MSG_RESULT(libwnn for Wnn6 not found.)])
-    AC_CHECK_LIB(wnn, jl_open_lang,, [AC_MSG_ERROR(libwnn not found.)])
+    AC_CHECK_LIB(wnn, jl_optimize_fi,, [AC_MSG_RESULT(libwnn for Wnn6 not found.)])
+  fi
+
+  if echo $LIBS | grep "wnn.*" > /dev/null; then
+    AC_DEFINE([HAVE_LIBWNN6],1,[])
+  else
+    AC_MSG_ERROR(Wnn6 or Wnn7 library not found.)
   fi
 fi