diff --git a/src/ChangeLog b/src/ChangeLog
index 244bef3d0..facfcc1ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-11-07  Andrew V. Samoilov  <kai@cmail.ru>
 
+	* cmd.c (guess_message_value): Make val static const array.
+	(smblink_cmd) [!WITH_SAMBA]: Eliminated.
+
 	* dlg.c (add_widget): Check for what is not NULL
 	before everything else.
 
diff --git a/src/cmd.c b/src/cmd.c
index fa35b2a96..0d23e7a8a 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1169,7 +1169,7 @@ void mkdir_panel_cmd (void)
 /* value should be freed by calling function g_free() */
 char *guess_message_value (void)
 {
-    const char *var[] = {
+    static const char * const var[] = {
 	/* The highest priority value is the `LANGUAGE' environment
         variable.  This is a GNU extension.  */
 	"LANGUAGE",
@@ -1298,13 +1298,13 @@ void ftplink_cmd (void)
     nice_cd (_(" FTP to machine "), _(machine_str),
 	     "[FTP File System]", "/#ftp:", 1);
 }
-
+#ifdef WITH_SMBFS
 void smblink_cmd (void)
 {
     nice_cd (_(" SMB link to machine "), _(machine_str),
 	     "[SMB File System]", "/#smb:", 0);
 }
-
+#endif
 #ifdef HAVE_SETSOCKOPT
 void source_routing (void)
 {