diff --git a/ChangeLog b/ChangeLog
index 880960bd32fe5d65c759545ebf2597e034d15af1..a12d815d2fbc6e68b077863b2a9f89b412ab0202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 CVS code 
 - General:
 	- Translation updates (see po/ChangeLog for details).
+- nano.c:
+  main()
+	- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP
+	  (David Benbennick).
 - nano.1, nano.1.html:
 	- Add initialization file comments, change some options from 
 	  bracketed to underlined to emphasize that they are not 
diff --git a/nano.c b/nano.c
index b87ec57e64bf1dd194fdd1367c4c2539a8756748..4ac10f345e11d0cb66e3f8aa4ab63e9430902083 100644
--- a/nano.c
+++ b/nano.c
@@ -3287,9 +3287,15 @@ int main(int argc, char *argv[])
 	int tabsize_cpy = tabsize;
 	long flags_cpy = flags;
 
+#ifndef DISABLE_OPERATINGDIR
 	operating_dir = NULL;
+#endif
+#ifndef DISABLE_JUSTIFY
 	quotestr = NULL;
+#endif
+#ifndef DISABLE_SPELLER
 	alt_speller = NULL;
+#endif
 
 	do_rcfile();