diff --git a/README b/README
index 8d876e435..b78ea6124 100644
--- a/README
+++ b/README
@@ -1466,10 +1466,14 @@ The following options need to be configured:
 		default value of 5 is used.
 
 - Command Interpreter:
-		CFG_AUTO_COMPLETE
+		CONFIG_AUTO_COMPLETE
 
 		Enable auto completion of commands using TAB.
 
+                Note that this feature has NOT been implemented yet
+                for the "hush" shell.
+
+
 		CFG_HUSH_PARSER
 
 		Define this variable to enable the "hush" shell (from
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 244e45a75..bc23fc027 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -74,7 +74,7 @@
 
 #define CFG_PROMPT_HUSH_PS2	"> "
 
-#define CFG_AUTO_COMPLETE 1
+#define CONFIG_AUTO_COMPLETE 1
 
 /* Define which ETH port will be used for connecting the network */
 #define CFG_ETH_PORT		ETH_0
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 7bbceb01b..2ad6f0698 100644
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -200,7 +200,6 @@
 
 /* Include auto complete with tabs */
 #define CONFIG_AUTO_COMPLETE 1
-#define CFG_AUTO_COMPLETE    1
 #define CFG_ALT_MEMTEST	     1	     /* use real memory test	 */
 
 
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index b96557148..465a4ecb8 100644
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -268,7 +268,7 @@
 
 /* Include auto complete with tabs */
 #define CONFIG_AUTO_COMPLETE 1
-#define CFG_AUTO_COMPLETE    1
+#define CONFIG_AUTO_COMPLETE 1
 #define CFG_ALT_MEMTEST	     1	     /* use real memory test	 */
 
 
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 372b10c62..a77ccef63 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -135,7 +135,7 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
 #define CFG_ENV_IN_OWN_SECT	1
-#define CFG_AUTO_COMPLETE
+#define CONFIG_AUTO_COMPLETE	1
 #define	CONFIG_EXTRA_ENV_SETTINGS	"ethprime=FCC3 ETHERNET"
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)