diff --git a/CHANGES b/CHANGES
index f08c4d6df80a16852a20b3e8c5426e5a939d5cb3..01376d0e2cd71a3e4064db84ef527985f9127118 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel(29 January 2004)
+- Stadler Stephan pointed out that src/hugehelp.c included config.h without
+  checking the define if its present...
+
 - Ken Hirsch provided patches to make curl build fine on the MPE/iX operating
   system.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 305ed721e967b87a9efa36897eff09a2a412fe64..2da8e896e10186741cf8c5535bb80c694ae244c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,18 +51,21 @@ EXTRA_DIST = mkhelp.pl curlmsg.msg makefile.dj \
 MANPAGE=$(top_srcdir)/docs/curl.1
 README=$(top_srcdir)/docs/MANUAL
 MKHELP=$(top_srcdir)/src/mkhelp.pl
+HUGE=hugehelp.c
 
 if HAVE_LIBZ
 # This generates the hugehelp.c file in both uncompressed and compressed formats
-hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
-	echo '#include "config.h"' > hugehelp.c
-	echo '#ifndef HAVE_LIBZ' >> hugehelp.c
-	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> hugehelp.c
-	echo '#else' >> hugehelp.c
-	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> hugehelp.c
-	echo '#endif /* HAVE_LIBZ */' >> hugehelp.c
+$(HUGE): $(README) $(MANPAGE)  mkhelp.pl
+	echo '#ifdef HAVE_CONFIG_H' > $(HUGE)
+	echo '#include "config.h"' >> $(HUGE)
+	echo '#endif' >> $(HUGE)
+	echo '#ifndef HAVE_LIBZ' >> $(HUGE)
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
+	echo '#else' >> $(HUGE)
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
+	echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
 else
 # This generates the hugehelp.c file uncompressed only
-hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
-	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) > hugehelp.c
+$(HUGE): $(README) $(MANPAGE)  mkhelp.pl
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) > $(HUGE)
 endif