diff --git a/ChangeLog b/ChangeLog
index f3d1f0786a58ff4afab2728a6266d8b97fb5463c..6c733c33277e998be992826658bd3ebad7218d7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 CVS code -
+General
+	- Changed #ifdefs to check for both DISABLE_TABCOMP and
+	  NANO_SMALL, makes tiny option leave out tab completion, which
+	  shoudl be left out in that circumstance.  Saves at least 5k.
 - configure.in:
 	- Fix for _use_keypad check breaking slang support (Christian
 	  Weisgerber).
diff --git a/files.c b/files.c
index 4e0316c1d6e35fd0a84a939b1d8f9ec0857ca4c9..64eb8bd28e00429ac54f3f19fe4b608222f21532 100644
--- a/files.c
+++ b/files.c
@@ -265,7 +265,7 @@ int do_insertfile(void)
 	fprintf(stderr, "filename is %s", answer);
 #endif
 
-#ifndef DISABLE_TABCOMP
+#if !defined(DISABLE_TABCOMP) && !defined(NANO_SMALL)
 	realname = real_dir_from_tilde(answer);
 #else
 	realname = mallocstrcpy(realname, answer);
@@ -276,7 +276,7 @@ int do_insertfile(void)
 	    
 	    char *tmp = do_browse_from(realname);
 
-#ifdef DISABLE_TABCOMP
+#if defined(DISABLE_TABCOMP)
 	    realname = NULL;
 #endif
 	    if 	(tmp != NULL)
@@ -342,7 +342,7 @@ int write_file(char *name, int tmp)
     if (buf != NULL)
 	free(buf);
 
-#ifndef DISABLE_TABCOMP
+#if !defined(DISABLE_TABCOMP) && !defined(NANO_SMALL)
     realname = real_dir_from_tilde(name);
 #else
     realname = mallocstrcpy(realname, name);
@@ -575,7 +575,7 @@ int do_writeout_void(void)
     return do_writeout(filename, 0);
 }
 
-#ifndef DISABLE_TABCOMP
+#if !defined(DISABLE_TABCOMP) && !defined(NANO_SMALL)
 static char **homedirs;
 
 /* Return a malloc()ed string containing the actual directory, used
diff --git a/utils.c b/utils.c
index a13964198fa8c9a9eb4ea8dfaba8b655a9e09d43..2c0e74859112994144b1ea5d5ee5227704d916c4 100644
--- a/utils.c
+++ b/utils.c
@@ -159,7 +159,7 @@ void new_magicline(void)
     totsize++;
 }
 
-#ifndef DISABLE_TABCOMP
+#if !defined(DISABLE_TABCOMP) && !defined(NANO_SMALL)
 /*
  * Routine to see if a text string is matched by a wildcard pattern.
  * Returns TRUE if the text is matched, or FALSE if it is not matched
diff --git a/winio.c b/winio.c
index e10d5cb46084174431fadfe460d68dc6ca0d4be0..e496e1a279d27bdad878e8b9525e31f033aa12c6 100644
--- a/winio.c
+++ b/winio.c
@@ -250,7 +250,7 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
     int kbinput = 0, j = 0, x = 0, xend;
     int x_left = 0, inputlen, tabbed = 0;
     char *inputbuf;
-#ifndef DISABLE_TABCOMP
+#if !defined(DISABLE_TABCOMP) && !defined(NANO_SMALL)
     int shift = 0;
 #endif
     
@@ -346,7 +346,7 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
 		x--;
 	    nanoget_repaint(buf, inputbuf, x);
 	    break;
-#ifndef DISABLE_TABCOMP
+#if !defined(DISABLE_TABCOMP) && !defined(NANO_SMALL)
 	case NANO_CONTROL_I:
 	    if (allowtabs) {
 		shift = 0;