diff --git a/ChangeLog b/ChangeLog
index 7ac9b71e..c8557da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+- removed FocusFollowMouse from wmaker and WPrefs
+
 Changes since version 0.64.0:
 .............................
 - fix with gnome hints stuff, related to tasklist/bar
diff --git a/NEWS b/NEWS
index db8205ba..23c9e7b9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
+
+Removed FocusFollowMouse option, only SloppyFocus present now.
+
+
 --- 0.65.0
 
 Single AppIcon
diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c
index 05eca76f..0e9b6227 100644
--- a/WPrefs.app/Focus.c
+++ b/WPrefs.app/Focus.c
@@ -35,8 +35,7 @@ typedef struct _Panel {
     WMWidget *parent;
     
     WMFrame *kfocF;
-    WMPopUpButton *kfocP;
-    WMLabel *kfocL;
+    WMButton *kfocB[2];
     
     WMFrame *cfocF;
     WMButton *autB;
@@ -74,17 +73,15 @@ showData(_Panel *panel)
     if (!str)
 	str = "manual";
     if (strcasecmp(str, "manual")==0 || strcasecmp(str, "clicktofocus")==0)
-	WMSetPopUpButtonSelectedItem(panel->kfocP, 0);
-    else if (strcasecmp(str, "auto")==0 || strcasecmp(str, "focusfollowsmouse")==0)
-	WMSetPopUpButtonSelectedItem(panel->kfocP, 1);
-    else if (strcasecmp(str, "semiauto")==0 || strcasecmp(str, "sloppy")==0)
-	WMSetPopUpButtonSelectedItem(panel->kfocP, 2);
+	WMSetButtonSelected(panel->kfocB[0], 1);
+    else if (strcasecmp(str, "auto")==0 || strcasecmp(str, "semiauto")==0 
+	     || strcasecmp(str, "sloppy")==0)
+	WMSetButtonSelected(panel->kfocB[1], 1);
     else {
 	wwarning(_("bad option value %s for option FocusMode. Using default Manual"),
 		 str);
-	WMSetPopUpButtonSelectedItem(panel->kfocP, 0);
+	WMSetButtonSelected(panel->kfocB[0], 1);
     }
-    changeFocusMode(panel->kfocP, panel);
 
     /**/
     str = GetStringForKey("ColormapMode");
@@ -137,17 +134,11 @@ storeData(_Panel *panel)
     char *str;
     int i;
 
-    switch (WMGetPopUpButtonSelectedItem(panel->kfocP)) {
-     case 1:
-	str = "auto";
-	break;
-     case 2:
+    if (WMGetButtonSelected(panel->kfocB[1]))
 	str = "sloppy";
-	break;
-     default:
+    else
 	str = "manual";
-	break;
-    }
+    
     SetStringForKey(str, "FocusMode");
 
     if (WMGetButtonSelected(panel->manB)) {
@@ -186,30 +177,6 @@ pushDelayButton(WMWidget *w, void *data)
 }
 
 
-static void
-changeFocusMode(WMWidget *w, void *data)
-{
-    _Panel *panel = (_Panel*)data;
-
-    switch (WMGetPopUpButtonSelectedItem(w)) {
-     case 0:
-	WMSetLabelText(panel->kfocL, _("Click on the window to set\n"\
-			"keyboard input focus."));
-	break;
-     case 1:
-	WMSetLabelText(panel->kfocL, _("Set keyboard input focus to\n"\
-			"the window under the mouse pointer,\n"\
-			"including the root window."));
-	break;
-     case 2:
-	WMSetLabelText(panel->kfocL, _("Set keyboard input focus to\n"\
-			"the window under the mouse pointer,\n"\
-			"except the root window."));
-	break;
-    }
-}
-
-
 static void
 raiseTextChanged(void *observerData, WMNotification *notification)
 {
@@ -246,21 +213,28 @@ createPanel(Panel *p)
     WMResizeWidget(panel->kfocF, 240, 130);
     WMMoveWidget(panel->kfocF, 15, 15);
     WMSetFrameTitle(panel->kfocF, _("Input Focus Mode"));
-    
-    panel->kfocP = WMCreatePopUpButton(panel->kfocF);
-    WMResizeWidget(panel->kfocP, 210, 20);
-    WMMoveWidget(panel->kfocP, 15, 30);
-    WMAddPopUpButtonItem(panel->kfocP, _("Click window to focus"));
-    WMAddPopUpButtonItem(panel->kfocP, _("Focus follows mouse"));
-    WMAddPopUpButtonItem(panel->kfocP, _("\"Sloppy\" focus"));
-    WMSetPopUpButtonAction(panel->kfocP, changeFocusMode, panel);
 
-    panel->kfocL = WMCreateLabel(panel->kfocF);
-    WMResizeWidget(panel->kfocL, 211, 68);
-    WMMoveWidget(panel->kfocL, 15, 55);
-    WMSetLabelTextAlignment(panel->kfocL, WACenter);
-    
-    WMMapSubwidgets(panel->kfocF);
+    {
+	WMBox *box = WMCreateBox(panel->kfocF);
+	WMSetViewExpandsToParent(WMWidgetView(box), 10, 15, 10, 10);
+	WMSetBoxHorizontal(box, False);
+	
+	panel->kfocB[0] = WMCreateRadioButton(box);
+	WMSetButtonText(panel->kfocB[0], _("Manual:  Click on the window to set "\
+			"keyboard input focus"));
+	WMAddBoxSubview(box, WMWidgetView(panel->kfocB[0]), True, True,
+			20, 0, 0);
+
+	panel->kfocB[1] = WMCreateRadioButton(box);
+	WMGroupButtons(panel->kfocB[0], panel->kfocB[1]);
+	WMSetButtonText(panel->kfocB[1], _("Auto:  Set keyboard input focus to "\
+			"the window under the mouse pointer"));
+	WMAddBoxSubview(box, WMWidgetView(panel->kfocB[1]), True, True,
+			20, 0, 0);
+
+	WMMapSubwidgets(box);
+	WMMapWidget(box);
+    }
     
     /***************** Colormap Installation Mode ****************/
     
diff --git a/WindowMaker/README b/WindowMaker/README
index 258cc570..4ecde51b 100644
--- a/WindowMaker/README
+++ b/WindowMaker/README
@@ -76,3 +76,5 @@ plmenu.ko Korean	Byeong-Chan Kim <redhands@linux.sarang.net>
 plemnu.es Spanish	David A. Schekaiban <nb@zaz.net>
 plmenu.bg Bulgarian	Slavei Karadjov <slaff@exco.net>
 plmenu.sk Slovak      	judas@hell <tomka@oalevice.sk>
+plmenu.ja Japanese	Seiichi SATO <sato@cvs-net.co.jp>
+
diff --git a/src/defaults.c b/src/defaults.c
index 22435a85..9136e7bc 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -225,7 +225,7 @@ static int setCursor();
 
 static WOptionEnumeration seFocusModes[] = {
     {"Manual", WKF_CLICK, 0}, {"ClickToFocus", WKF_CLICK, 1},
-    {"Sloppy", WKF_SLOPPY, 0}, {"SemiAuto", WKF_SLOPPY, 1},
+    {"Sloppy", WKF_SLOPPY, 0}, {"SemiAuto", WKF_SLOPPY, 1}, {"Auto", WKF_SLOPPY, 1},
     {NULL, 0, 0}
 };