diff --git a/lib/Makefile.am b/lib/Makefile.am
index fff5dacfd4b99cddd8c0057c37e42ee33b022aec..4a35c72c669378ac940b517e1f6391d9fe43484f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -32,7 +32,7 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 
 EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP)                 \
  vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h            \
- config-mac.h curl_config.h.in makefile.dj config.dos libcurl.plist        \
+ config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist      \
  libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga		   \
  Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot   \
  config-win32ce.h config-os400.h setup-os400.h config-symbian.h		   \
diff --git a/lib/config.dos b/lib/config-dos.h
similarity index 98%
rename from lib/config.dos
rename to lib/config-dos.h
index 78f0c6b686b887577962fbe1bdffa0488bbbdb0b..863539b737bdce827543f40fcc7d540bf333ca09 100644
--- a/lib/config.dos
+++ b/lib/config-dos.h
@@ -3,7 +3,7 @@
 
 
 /* ================================================================ */
-/*        lib/config.dos - Hand crafted config file for DOS         */
+/*       lib/config-dos.h - Hand crafted config file for DOS        */
 /* ================================================================ */
 
 #if defined(DJGPP)
diff --git a/lib/makefile.dj b/lib/makefile.dj
index 90faf3371c7582122c85d2738c29486ee92b1a8f..d9f159d3d92417df703069a333898dc0b2de859e 100644
--- a/lib/makefile.dj
+++ b/lib/makefile.dj
@@ -21,7 +21,7 @@ all: $(OBJ_DIR) curl_config.h $(CURL_LIB)
 $(CURL_LIB): $(OBJECTS)
 	ar rs $@ $?
 
-curl_config.h: config.dos
+curl_config.h: config-dos.h
 	$(COPY) $^ $@
 
 # clean generated files
diff --git a/src/makefile.dj b/src/makefile.dj
index fc3ae16d849ef4754f835e2074eab43364e8aaed..49929085e1b07b20b2120384afdf9c7b94bf8596 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -46,9 +46,9 @@ $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
 
 curl_config.h:
 ifeq ($(IS_UNIX_SHELL),1)
-	@echo '#include "../lib/config.dos"' > $@
+	@echo '#include "../lib/config-dos.h"' > $@
 else
-	@echo #include "../lib/config.dos" > $@
+	@echo #include "../lib/config-dos.h" > $@
 endif
 
 #