diff --git a/ChangeLog b/ChangeLog
index 9a2b911fa2a23ba2ab80cc794d3c58be53f5027d..a47f5900427d4c352f3b9287cab1c7692f6f9144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@ CVS code -
 - General
 	- Type misalignments and mem leaks in renumber_all, do_justify
 	  and do_spell (Rocco & Steven Kneizys).
+- nano.c:
+  main()
+	- Put NANO_SMALL defines around toggle pointer (noticed by Jordi);
+- utils.c:
+  stristr() - Defined regardless of NANO_SMALL (noticed by Jordi).
 	  
 GNU nano 1.1.7 - 03/05/2002
 - General
diff --git a/nano.c b/nano.c
index 522521af8c6fbbc0b5d0f627b1edfba2db5b8dbd..49ba10b30399494571a81c308f4630b36bdf334e 100644
--- a/nano.c
+++ b/nano.c
@@ -2775,7 +2775,9 @@ int main(int argc, char *argv[])
     int modify_control_seq;
     char *argv0;
     shortcut *s;
+#ifndef NANO_SMALL
     toggle *t;
+#endif
 
 #ifdef _POSIX_VDISABLE
     struct termios term;
diff --git a/utils.c b/utils.c
index 810cde6547fe1358624308a23b378ea391359f56..826c86a4b265b976aff24d8b1af632ca0bb74aad 100644
--- a/utils.c
+++ b/utils.c
@@ -89,6 +89,7 @@ char *revstristr(char *haystack, char *needle, char *rev_start)
     }
     return 0;
 }
+#endif /* NANO_SMALL */
 
 /* This is now mutt's version (called mutt_stristr) because it doesn't
    use memory allocation to do a simple search (yuck). */
@@ -110,7 +111,6 @@ char *stristr(char *haystack, char *needle)
     }
     return NULL;
 }
-#endif /* NANO_SMALL */
 
 char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 {