diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-gtk/menu.c freeciv/client/gui-gtk/menu.c
--- FreecivCVS/client/gui-gtk/menu.c	Fri Oct 27 18:20:03 2000
+++ freeciv/client/gui-gtk/menu.c	Wed Dec  6 09:07:50 2000
@@ -622,7 +622,7 @@
 	orders_menu_callback,	MENU_ORDER_BUILD_WONDER					},
   { "/" N_("Orders") "/" N_("Make Trade Route"),	"<shift>r",
 	orders_menu_callback,	MENU_ORDER_TRADEROUTE					},
-  { "/" N_("Orders") "/" N_("Diplomat|Spy Actions"),	"<shift>b",
+  { "/" N_("Orders") "/" N_("Diplomat|Spy Actions"),	"d",
 	orders_menu_callback,	MENU_ORDER_DIPLOMAT_DLG					},
   { "/" N_("Orders") "/" N_("Explode Nuclear"),		"<shift>n",
 	orders_menu_callback,	MENU_ORDER_NUKE						},
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/actions.c freeciv/client/gui-xaw/actions.c
--- FreecivCVS/client/gui-xaw/actions.c	Fri Oct 27 18:20:04 2000
+++ freeciv/client/gui-xaw/actions.c	Wed Dec  6 09:21:46 2000
@@ -343,9 +343,6 @@
     if (unit_flag(punit->type, F_SETTLERS)) {
       if(is_menu_item_active(MENU_ORDER, MENU_ORDER_BUILD_CITY))
 	key_unit_build_city();
-    } else if (unit_flag(punit->type, F_DIPLOMAT)) {
-      if(is_menu_item_active(MENU_ORDER, MENU_ORDER_DIPLOMAT_DLG))
-	key_unit_diplomat_actions();
     } else {
       if(is_menu_item_active(MENU_ORDER, MENU_ORDER_BUILD_WONDER))
 	key_unit_build_wonder();
@@ -365,6 +362,12 @@
     key_unit_connect();
 }
 
+static void xaw_key_unit_diplomat_spy_action(Widget w, XEvent *event, String *argv, Cardinal *argc)
+{
+  if(is_menu_item_active(MENU_ORDER, MENU_ORDER_DIPLOMAT_DLG))
+    key_unit_diplomat_actions();
+}
+
 static void xaw_key_unit_disband(Widget w, XEvent *event, String *argv, Cardinal *argc)
 {
   if(is_menu_item_active(MENU_ORDER, MENU_ORDER_DISBAND))
@@ -640,6 +643,7 @@
   { "key-unit-build-city-or-wonder", xaw_key_unit_build_city_or_wonder },
   { "key-unit-build-wonder", xaw_key_unit_build_wonder },
   { "key-unit-connect", xaw_key_unit_connect },
+  { "key-unit-diplomat-spy-action", xaw_key_unit_diplomat_spy_action },
   { "key-unit-disband", xaw_key_unit_disband },
   { "key-unit-done", xaw_key_unit_done },
   { "key-unit-fallout", xaw_key_unit_fallout },
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/menu.c freeciv/client/gui-xaw/menu.c
--- FreecivCVS/client/gui-xaw/menu.c	Fri Oct 27 18:20:06 2000
+++ freeciv/client/gui-xaw/menu.c	Wed Dec  6 09:38:05 2000
@@ -177,7 +177,7 @@
     { { N_("Disband Unit"), 0         },     "D", MENU_ORDER_DISBAND, 0 },
     { { N_("Help Build Wonder"), 0    },     "b", MENU_ORDER_BUILD_WONDER, 0 },
     { { N_("Make Trade Route"), 0     },     "r", MENU_ORDER_TRADEROUTE, 0 },
-    { { N_("Diplomat/Spy Actions"), 0 },     "b", MENU_ORDER_DIPLOMAT_DLG, 0},
+    { { N_("Diplomat/Spy Actions"), 0 },     "d", MENU_ORDER_DIPLOMAT_DLG, 0},
     { { N_("Explode Nuclear"), 0      },     "N", MENU_ORDER_NUKE, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
     { { N_("Wait"), 0                 },     "w", MENU_ORDER_WAIT, 0 },
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/Freeciv freeciv/data/Freeciv
--- FreecivCVS/data/Freeciv	Fri Oct 27 18:20:10 2000
+++ freeciv/data/Freeciv	Wed Dec  6 09:23:51 2000
@@ -2778,6 +2778,7 @@
    <Key>a:            key-unit-auto-attack-or-settle() \n\
    <Key>b:            key-unit-build-city-or-wonder()  \n\
    <Key>c:            key-center-on-unit()             \n\
+   <Key>d:            key-unit-diplomat-spy-action()   \n\
    <Key>e:            key-unit-airbase()               \n\
    <Key>f:            key-unit-fortify-or-fortress()   \n\
    <Key>g:            key-unit-goto()                  \n\
@@ -2854,6 +2855,7 @@
    <Key>a:            key-unit-auto-attack-or-settle() \n\
    <Key>b:            key-unit-build-city-or-wonder()  \n\
    <Key>c:            key-center-on-unit()             \n\
+   <Key>d:            key-unit-diplomat-spy-action()   \n\
    <Key>e:            key-unit-airbase()               \n\
    <Key>f:            key-unit-fortify-or-fortress()   \n\
    <Key>g:            key-unit-goto()                  \n\
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/helpdata.txt freeciv/data/helpdata.txt
--- FreecivCVS/data/helpdata.txt	Fri Oct 27 18:20:10 2000
+++ freeciv/data/helpdata.txt	Wed Dec  6 09:36:08 2000
@@ -440,10 +440,11 @@
 =========\n\
   a: (a)uto-settler  (settler units)\n\
   a: (a)uto-attack  (military units)\n\
-  c: (c)enter view on unit\n\
-  C: unit (C)onnect (then left-click mouse to select destination)\n\
   b: (b)uild city  (settler units)\n\
   b: help (b)uild wonder  (caravan units)\n\
+  c: (c)enter view on unit\n\
+  C: unit (C)onnect (then left-click mouse to select destination)\n\
+  d: (d)iplomat/spy actions  (diplomat/spy units)\n\
   D: (D)isband unit\n\
   e: build airbas(e) (airbase units)\n\
   f: (f)ortify unit  (military units)\n\
@@ -457,16 +458,16 @@
   o: transf(o)rm terrain\n\
   p: clean (p)ollution\n\
   P: (P)illage terrain alteration\n\
+  q: unit patrol  (then left-click mouse to select destination)\n\
   r: build (r)oad/railroad  (settler units)\n\
   r: establish trade (r)oute  (caravan units)\n\
   R: incite a (R)evolution\n\
-  q: unit patrol  (then left-click mouse to select destination)\n\
   s: (s)entry unit\n\
+  t: show (t)iles city is using  (mouse over or near city)\n\
+  T: open (t)ax/lux/sci rates dialog\n\
   u: (u)nload boat\n\
   w: (w)ait until later in turn\n\
   W: (W)ake up other units on tile\n\
-  t: show (t)iles city is using  (mouse over or near city)\n\
-  T: open (t)ax/lux/sci rates dialog\n\
   x: auto-e(x)plore\n\
 \n\
   1: move south-west                  F1: open City Report\n\