diff --git a/scim-wnn/src/romkan_table.h b/scim-wnn/src/romkan_table.h
index c9f0d99..f65d44f 100644
--- a/scim-wnn/src/romkan_table.h
+++ b/scim-wnn/src/romkan_table.h
@@ -185,6 +185,11 @@
     "gyu",  "����",
     "gye",  "����",
     "gyo",  "����",
+    "bya",  "�Ӥ�",
+    "byi",  "�Ӥ�",
+    "byu",  "�Ӥ�",
+    "bye",  "�Ӥ�",
+    "byo",  "�Ӥ�",
     "pya",  "�Ԥ�",
     "pyi",  "�Ԥ�",
     "pyu",  "�Ԥ�",
@@ -258,7 +263,7 @@
     "Z9",   "��",
     "Z0",   "��",
 
-    "Z-",   "��",
+    //"Z-",   "��",
     "Z^",   "��",
     "Z\\",   "��",
     "z1",   "��",
@@ -312,7 +317,7 @@
     "z*",   "��",
     "z+",   "��",
     "z/",   "��",
-    "z\\",  "��",
+    //"z\\",  "��",
 
     "Z-",   "��",
     "Z[",   "��",
diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index fc5bb93..4e8ff0b 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -209,13 +209,17 @@
     numkeyselect = _scim_config->read(String(SCIM_CONFIG_WNN_NUMKEY_SELECT),SCIM_DEFAULT_WNN_NUMKEY_SELECT);
     yosoku = _scim_config->read(String(SCIM_CONFIG_WNN_YOSOKU),SCIM_DEFAULT_WNN_YOSOKU);
     String t = _scim_config->read(String(SCIM_CONFIG_WNN_SERVERTYPE),String(SCIM_DEFAULT_WNN_SERVERTYPE));
+
     if (t == "Wnn6") {
         sType = Wnn6;
     } else if (t == "Wnn7") {
         sType = Wnn7;
+    } else if (t == "Wnn8") {
+        sType = Wnn8;
     } else {
         sType = Wnn4;
     }
+
     defaultPreEditor = _scim_config->read(String(SCIM_CONFIG_WNN_DEFAULT_PREEDITOR),String(SCIM_DEFAULT_WNN_DEFAULT_PREEDITOR));
     auto_conversion = _scim_config->read(String(SCIM_CONFIG_WNN_AUTO_CONVERSION),SCIM_DEFAULT_WNN_AUTO_CONVERSION);;
 
diff --git a/scim-wnn/src/scim_wnn_imengine_setup.cpp b/scim-wnn/src/scim_wnn_imengine_setup.cpp
index 48c475f..3d43327 100644
--- a/scim-wnn/src/scim_wnn_imengine_setup.cpp
+++ b/scim-wnn/src/scim_wnn_imengine_setup.cpp
@@ -186,6 +186,11 @@
     },
     {
         NULL,
+        String("Wnn8"),
+        N_("Wnn8"),
+    },
+    {
+        NULL,
         String("Romkan"),
         N_("Roma-Kana input"),
     },
@@ -576,6 +581,7 @@
     list = g_list_append(list,__list_data[0].widget);
     list = g_list_append(list,__list_data[1].widget);
     list = g_list_append(list,__list_data[2].widget);
+    list = g_list_append(list,__list_data[3].widget);
     __widget_servertype = gtk_list_new ();
     gtk_list_append_items(GTK_LIST(__widget_servertype),list);
     gtk_widget_show (__widget_servertype);
@@ -596,8 +602,8 @@
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
 
     list = NULL;
-    list = g_list_append(list,__list_data[3].widget);
     list = g_list_append(list,__list_data[4].widget);
+    list = g_list_append(list,__list_data[5].widget);
     __widget_preeditor = gtk_list_new ();
     gtk_list_append_items(GTK_LIST(__widget_preeditor),list);
     gtk_widget_show (__widget_preeditor);
diff --git a/scim-wnn/src/wnnconversion.h b/scim-wnn/src/wnnconversion.h
index 3cedf6f..605c2de 100644
--- a/scim-wnn/src/wnnconversion.h
+++ b/scim-wnn/src/wnnconversion.h
@@ -44,7 +44,7 @@
 @author TAM(Teppei Tamra)
 */
 enum KouhoType { DEFAULT, IKEIJI, RENSOU, YOSOKU };
-enum JServerType { Wnn4, Wnn6, Wnn7 };
+enum JServerType { Wnn4, Wnn6, Wnn7, Wnn8 };
 
 class WnnConversionList{
 public: