diff -Nur -X/home/thue/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-gtk/citydlg.c workdir2/client/gui-gtk/citydlg.c
--- freeciv/client/gui-gtk/citydlg.c	Tue May 23 16:22:15 2000
+++ workdir2/client/gui-gtk/citydlg.c	Tue May 23 22:20:23 2000
@@ -849,6 +849,9 @@
 	|| !can_unit_do_activity(punit, ACTIVITY_FORTIFYING)) {
       message_dialog_button_set_sensitive(wd, "button3", FALSE);
     }
+    if (punit->homecity == pcity->id) {
+      message_dialog_button_set_sensitive(wd, "button5", FALSE);
+    }
     if (can_upgrade_unittype(game.player_ptr,punit->type) == -1) {
       message_dialog_button_set_sensitive(wd, "button6", FALSE);
     }
diff -Nur -X/home/thue/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-xaw/citydlg.c workdir2/client/gui-xaw/citydlg.c
--- freeciv/client/gui-xaw/citydlg.c	Tue May 23 16:22:25 2000
+++ workdir2/client/gui-xaw/citydlg.c	Tue May 23 22:24:22 2000
@@ -1369,6 +1369,9 @@
 	|| !can_unit_do_activity(punit, ACTIVITY_FORTIFYING)) {
       XtSetSensitive(XtNameToWidget(wd, "*button3"), FALSE);
     }
+    if (punit->homecity == pcity->id) {
+      XtSetSensitive(XtNameToWidget(wd, "*button5"), FALSE);
+    }
     if (can_upgrade_unittype(game.player_ptr,punit->type) == -1) {
       XtSetSensitive(XtNameToWidget(wd, "*button6"), FALSE);
     }