diff --git a/src/ChangeLog b/src/ChangeLog
index f5648fff7..58ba989d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-06-13  Pavel Roskin  <proski@gnu.org>
 
+	* screen.c (user_file_menu_cmd) [HAVE_X]: Disable.
+	(panel_callback) [HAVE_X]: Don't define labels, they are unused.
+	* user.c [HAVE_X]: Disable all user meny code.
+
 	* color.c (color_table): Make static. Only use in text edition.
 	* xtty.h: Remove unused definitions.
 
diff --git a/src/screen.c b/src/screen.c
index 40cac1783..99900a9d9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2371,7 +2371,11 @@ panel_key (WPanel *panel, int key)
     return 0;
 }
 
-void user_file_menu_cmd (void) { user_menu_cmd (NULL); }
+#ifndef HAVE_X
+void user_file_menu_cmd (void) {
+    user_menu_cmd (NULL);
+}
+#endif /* !HAVE_X */
 
 static int
 panel_callback (Dlg_head *h, WPanel *panel, int msg, int par)
@@ -2379,16 +2383,8 @@ panel_callback (Dlg_head *h, WPanel *panel, int msg, int par)
     switch (msg){
     case WIDGET_INIT:
 #ifdef HAVE_X
-	define_label (h, (Widget *)panel, 1, _("Help"), help_cmd);
-	define_label (h, (Widget *)panel, 2, _("Menu"), user_file_menu_cmd);
-	define_label (h, (Widget *)panel, 3, _("View"), view_panel_cmd);
-	define_label (h, (Widget *)panel, 4, _("Edit"), edit_panel_cmd);
-	define_label (h, (Widget *)panel, 5, _("Copy"), copy_cmd);
-	define_label (h, (Widget *)panel, 6, _("RenMov"), ren_cmd);
-	define_label (h, (Widget *)panel, 7, _("Mkdir"), mkdir_panel_cmd);
-	define_label (h, (Widget *)panel, 8, _("Delete"), delete_cmd);
 	x_create_panel (h, h->wdata, panel);
-#endif
+#endif /* !HAVE_X */
 	return 1;
 
     case WIDGET_DRAW:
diff --git a/src/user.c b/src/user.c
index 514fdef10..a3b7c9c2f 100644
--- a/src/user.c
+++ b/src/user.c
@@ -258,6 +258,7 @@ char *expand_format (char c, int quote)
     return g_strdup ("");
 }
 
+#ifndef HAVE_X
 /* Checks for shell patterns definition */
 char *check_patterns (char *p)
 {
@@ -788,3 +789,4 @@ void user_menu_cmd (WEdit *edit_widget)
 	g_free (entries);
     g_free (data);
 }
+#endif /* !HAVE_X */