diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 2c16276..d15c694 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -177,6 +177,8 @@
 	}
 }
 
+#ifdef BB_FEATURE_SH_TAB_COMPLETION
+
 char** username_completion_matches(char* command, int *num_matches)
 {
 	char **matches = (char **) NULL;
@@ -225,6 +227,7 @@
 
 	return (matches);
 }
+#endif
 
 /*
  * This function is used to grab a character buffer
@@ -340,6 +343,7 @@
 			}
 			break;
 		case '\t':
+#ifdef BB_FEATURE_SH_TAB_COMPLETION
 			{
 				/* Do TAB completion */
 				static int num_matches=0;
@@ -436,6 +440,9 @@
 				}
 				break;
 			}
+#else
+			break;
+#endif
 		case '\b':
 		case DEL:
 			/* Backspace */