diff --git a/.gitignore b/.gitignore
index 757af59d..cac50ede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -306,7 +306,7 @@ tools/icmd_1.icd
 tools/icmd_2.icd
 tools/icmd_3.icd
 tools/kssf.com
-tools/tools.mak
+tools/makefile.mak
 tools/vspawn.com
 tools/watcomc.cfg
 utils/watcomc.cfg
diff --git a/build.bat b/build.bat
index 375f2f1f..2ffb1229 100644
--- a/build.bat
+++ b/build.bat
@@ -4,7 +4,7 @@ set SWAP=YES-DXMS-SWAP____________________
 if NOT "%SWAP%"=="YES-DXMS-SWAP____________________" goto err1
 : BEGIN Internal stuff for ska -- If one of these three commands
 :       fail for you, your distribution is broken! Please report.
-for %%a in (lib\lib.mak cmd\cmd.mak shell\command.mak) do if not exist %%a set SWAP=NO
+for %%a in (lib\makefile.mak cmd\makefile.mak shell\makefile.mak) do if not exist %%a set SWAP=NO
 if "%SWAP%"=="NO" set XMS_SWAP=
 if "%SWAP%"=="NO" call dmake dist
 : END
@@ -83,10 +83,10 @@ echo Building FreeCOM for language %LNG%
 
 if not "%MAKE%" == "" goto skip_make
 
-if "%COMPILER%" == "TC2"      set MAKE=%TC2_BASE%\make -f
-if "%COMPILER%" == "TURBOCPP" set MAKE=%TP1_BASE%\bin\make -f
-if "%COMPILER%" == "BC5"      set MAKE=%BC5_BASE%\bin\make -f
-if "%COMPILER%" == "WATCOM"   set MAKE=wmake -ms -h -f 
+if "%COMPILER%" == "TC2"      set MAKE=%TC2_BASE%\make -fmakefile.mak
+if "%COMPILER%" == "TURBOCPP" set MAKE=%TP1_BASE%\bin\make -f makefile.mak
+if "%COMPILER%" == "BC5"      set MAKE=%BC5_BASE%\bin\make -f makefile.mak
+if "%COMPILER%" == "WATCOM"   set MAKE=wmake -ms -h -f makefile.mak
 
 echo Make is %MAKE%.
 
@@ -97,10 +97,10 @@ echo Checking SUPPL library
 cd suppl
 if exist skip goto endSuppl
 echo Building SUPPL library
-%MAKE% suppl.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd src
-%MAKE% suppl.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 :endSuppl
@@ -110,7 +110,7 @@ echo.
 echo Making basic utilities for build process
 echo.
 cd utils
-%MAKE% utils.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 
@@ -118,10 +118,10 @@ echo.
 echo Making STRINGS resource
 echo.
 cd strings
-%MAKE% strings.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd strings
-%MAKE% strings.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..\..
 
@@ -129,7 +129,7 @@ echo.
 echo Making CRITER resource
 echo.
 cd criter
-%MAKE% criter.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 
@@ -137,7 +137,7 @@ echo.
 echo Making misc library
 echo.
 cd lib
-%MAKE% lib.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 
@@ -145,7 +145,7 @@ echo.
 echo Making commands library
 echo.
 cd cmd
-%MAKE% cmd.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 
@@ -153,7 +153,7 @@ echo.
 echo Making COMMAND.COM
 echo.
 cd shell
-%MAKE% command.mak all
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 
@@ -169,10 +169,10 @@ echo.
 echo Making supplemental tools
 echo.
 cd tools
-type tools.m1 >tools.mak
-..\utils\mktools.exe >>tools.mak
-type tools.m2 >>tools.mak
-%MAKE% tools.mak all
+type tools.m1 >makefile.mak
+..\utils\mktools.exe >>makefile.mak
+type tools.m2 >>makefile.mak
+%MAKE% all
 if errorlevel 1 goto ende
 cd ..
 
diff --git a/build.sh b/build.sh
index 259ff729..2deb178e 100755
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,7 @@ fi
 export SWAP=YES-DXMS-SWAP____________________
 # BEGIN Internal stuff for ska -- If one of these three commands
 #       fail for you, your distribution is broken! Please report.
-for a in lib/lib.mak cmd/cmd.mak shell/command.mak; do if [ ! -f $a ]; then export SWAP=NO; fi; done
+for a in lib/makefile.mak cmd/makefile.mak shell/makefile.mak; do if [ ! -f $a ]; then export SWAP=NO; fi; done
 if [ "$SWAP" == "NO" ]; then
     unset XMS_SWAP
     dmake dist
@@ -87,7 +87,7 @@ echo Building FreeCOM for language $LNG
 if [ -z "$MAKE" ]; then
     case "$COMPILER" in
 	watcom)
-	    export MAKE="wmake -ms -h -f"
+	    export MAKE="wmake -ms -h -f makefile.mak"
 	    ;;
 	gcc)
 	    export MAKE="make -f gnumake.mak"
@@ -114,11 +114,11 @@ gnumake_subst () {
 if $MAKE -? 2>&1 | grep -q gnu; then
     gnumake_subst . config.mak gnuconf.mak
     for i in suppl utils strings criter lib cmd; do
-	gnumake_subst $i $i.mak gnumake.mak
+	gnumake_subst $i makefile.mak gnumake.mak
     done
-    gnumake_subst suppl/src suppl.mak gnumake.mak
-    gnumake_subst strings/strings strings.mak gnumake.mak
-    gnumake_subst shell command.mak gnumake.mak
+    gnumake_subst suppl/src makefile.mak gnumake.mak
+    gnumake_subst strings/strings makefile.mak gnumake.mak
+    gnumake_subst shell makefile.mak gnumake.mak
 fi
 
 echo
@@ -126,10 +126,10 @@ echo Checking SUPPL library
 cd suppl
 if [ ! -f skip ]; then
     echo Building SUPPL library
-    $MAKE suppl.mak all
+    $MAKE all
 
     cd src
-    $MAKE suppl.mak all
+    $MAKE all
     cd ..
 fi
 cd ..
@@ -138,44 +138,44 @@ echo
 echo Making basic utilities for build process
 echo
 cd utils
-$MAKE utils.mak all
+$MAKE all
 cd ..
 
 echo
 echo Making STRINGS resource
 echo
 cd strings
-$MAKE strings.mak all
+$MAKE all
 cd strings
-$MAKE strings.mak all
+$MAKE all
 cd ../..
 
 echo
 echo Making CRITER resource
 echo
 cd criter
-$MAKE criter.mak all
+$MAKE all
 cd ..
 
 echo
 echo Making misc library
 echo
 cd lib
-$MAKE lib.mak all
+$MAKE all
 cd ..
 
 echo
 echo Making commands library
 echo
 cd cmd
-$MAKE cmd.mak all
+$MAKE all
 cd ..
 
 echo
 echo Making COMMAND.COM
 echo
 cd shell
-$MAKE command.mak all
+$MAKE all
 cd ..
 
 utils/mkinfres.exe -Tinfo.txt infores shell/command.map shell/command.exe
@@ -186,13 +186,13 @@ echo
 echo Making supplemental tools
 echo
 cd tools
-cat tools.m1 > tools.mak
-../utils/mktools.exe >>tools.mak
-cat tools.m2 >>tools.mak
+cat tools.m1 > makefile.mak
+../utils/mktools.exe >>makefile.mak
+cat tools.m2 >>makefile.mak
 if $MAKE -? 2>&1 | grep -q gnu; then
-    gnumake_subst . tools.mak gnumake.mak
+    gnumake_subst . makefile.mak gnumake.mak
 fi
-$MAKE tools.mak all
+$MAKE all
 cd ..
 
 echo
diff --git a/ci_build.sh b/ci_build.sh
index fbbb13ae..61fcad06 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -56,7 +56,7 @@ git clean -q -x -d -f -e _output -e _watcom -e _download
 {
   echo set COMPILER=WATCOM
   echo set WATCOM='C:\\devel\\watcomc'
-  echo set MAKE=wmake /ms /h /f
+  echo set MAKE=wmake /ms /h /f makefile.mak
   echo set XNASM='C:\\devel\\nasm\\nasm'
   echo set XUPX=upx --8086 --best
   echo set OLDPATH=%PATH%
diff --git a/clean.bat b/clean.bat
index 4dfeca76..f86e953f 100644
--- a/clean.bat
+++ b/clean.bat
@@ -17,7 +17,7 @@ call %0 criter\  criter criter1 context.def context.inc context.h_c
 call %0 cmd\     cmds.lib    cmds.lst    cmds.rsp    echolib.bat
 call %0 lib\     freecom.lib freecom.lst freecom.rsp echolib.bat
 call %0 shell\   command.exe command.map command.rsp echoto.bat
-call %0 tools\   tools.mak
+call %0 tools\   makefile.mak
 
 call %0 strings\*.     cfg obj     exe
 call %0 strings\strings\*. c obj
diff --git a/clean.sh b/clean.sh
index 3c5f1651..79bc2c73 100755
--- a/clean.sh
+++ b/clean.sh
@@ -13,7 +13,7 @@ cd ../lib     && rm -f freecom.lib freecom.lst freecom.rsp echolib.bat
 cd ../shell   && rm -f command.exe command.map command.rsp echoto.bat
 cd ../strings && rm -f *.cfg *.obj *.exe
 cd ../strings/strings && rm -f strings.lib strings.lst strings.rsp *.c *.obj *.o makefile
-cd ../../tools && rm -f tools.mak *.icd *.cfg *.obj *.map *.exe *.com
+cd ../../tools && rm -f makefile.mak *.icd *.cfg *.obj *.map *.exe *.com
 cd ../utils   && rm -f *.cfg *.obj *.map *.exe
 for i in cmd lib shell criter; do cd ../$i && rm -f *.obj *.cfg; done
 cd .. && rm -f gnuconf.mak $(find * -name gnumake.mak)
diff --git a/cmd/cmd.m1 b/cmd/cmd.m1
index 10a73fa2..ec0f5436 100644
--- a/cmd/cmd.m1
+++ b/cmd/cmd.m1
@@ -1,6 +1,6 @@
 .AUTODEPEND
 
-CFG_DEPENDENCIES = cmd.mak
+CFG_DEPENDENCIES = makefile.mak
 
 !include "..\config.mak"
 
diff --git a/cmd/makefile b/cmd/makefile
index c47c236e..5aa408fe 100644
--- a/cmd/makefile
+++ b/cmd/makefile
@@ -70,7 +70,7 @@ HDR = ..\config.h ..\err_fcts.h ..\include/batch.h ..\include/cmdline.h \
 #	Default target
 all: cmds.lib
 
-dist: cmd.mak
+dist: makefile.mak
 
 %.obj : %.asm ; $(NASM) $(NASMFLAGS) -f obj -F borland -o $@ $< >>errlist
 
@@ -248,12 +248,12 @@ DYNSOURCES =
 #MAKEDEP STOP
 
 clobber : clean
-	$(RM) $(RMFLAGS) *.com *.cln *.lib *.lst *.cfg cmd.mak
+	$(RM) $(RMFLAGS) *.com *.cln *.lib *.lst *.cfg makefile.mak
 
 clean : 
 	$(RM) $(RMFLAGS) *.lst *.map *.bin *.bak *.las *.obj *.exe $(CFG) *.dmp com.com tags errlist
 
 
-cmd.mak : makefile cmd.m1 cmd.m2
+makefile.mak : makefile cmd.m1 cmd.m2
 	+copy cmd.m1 + $(mktmp cmds.lib : \44(CFG) $(OBJ:t" \\\\\\n\\t") \n\tif exist cmds.lib \44(AR) cmds.lib /c @&&|\n+-$(OBJ:t" &\\n+-")\n| , cmds.lst \n\tif not exist cmds.lib \44(AR) cmds.lib /c @&&|\n+$(OBJ:t" &\\n+")\n| , cmds.lst \n) + cmd.m2 $@
 
diff --git a/cmd/cmd.mak b/cmd/makefile.mak
similarity index 93%
rename from cmd/cmd.mak
rename to cmd/makefile.mak
index 50780fd4..e64edff7 100644
--- a/cmd/cmd.mak
+++ b/cmd/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = cmd.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=..
 !include "$(TOP)/config.mak"
@@ -50,7 +50,7 @@ OBJ5 =	rmdir.obj \
 echolib.bat : ../scripts/echolib.bat
 	$(CP) ..$(DIRSEP)scripts$(DIRSEP)echolib.bat .
 
-cmds.rsp : echolib.bat cmd.mak
+cmds.rsp : echolib.bat makefile.mak
 	$(RMFILES) cmds.rsp
 	$(ECHOLIB) cmds.rsp $(OBJ1)
 	$(ECHOLIB) cmds.rsp $(OBJ2)
diff --git a/criter/criter.mak b/criter/makefile.mak
similarity index 93%
rename from criter/criter.mak
rename to criter/makefile.mak
index b859bdc1..b0222df9 100644
--- a/criter/criter.mak
+++ b/criter/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = criter.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=..
 !include "$(TOP)/config.mak"
diff --git a/lib/lib.m1 b/lib/lib.m1
index ce05b6bb..05e37b8c 100644
--- a/lib/lib.m1
+++ b/lib/lib.m1
@@ -1,6 +1,6 @@
 .AUTODEPEND
 
-CFG_DEPENDENCIES = lib.mak
+CFG_DEPENDENCIES = makefile.mak
 
 !include "..\config.mak"
 
diff --git a/lib/makefile b/lib/makefile
index 83a70456..0e8369b1 100644
--- a/lib/makefile
+++ b/lib/makefile
@@ -159,7 +159,7 @@ SRC += $(SRC_ERR)
 OBJ += $(OBJ_ERR)
 
 
-dist : lib.mak
+dist : makefile.mak
 
 %.obj : %.asm ; $(NASM) $(NASMFLAGS) -f obj -F borland -o $@ $< >>errlist
 
@@ -640,13 +640,13 @@ DYNSOURCES =
 #MAKEDEP STOP
 
 clobber : clean
-	$(RM) $(RMFLAGS) *.com *.cln *.lib *.lst *.cfg lib.mak
+	$(RM) $(RMFLAGS) *.com *.cln *.lib *.lst *.cfg makefile.mak
 
 clean : 
 	$(RM) $(RMFLAGS) *.lst *.map *.bin *.bak *.las *.obj *.exe $(CFG) *.dmp com.com tags errlist lib.m3
 
 
-lib.mak : makefile lib.m1 lib.m2
+makefile.mak : makefile lib.m1 lib.m2
 	..\utils\chunk freecom_deps <$(mktmp $(OBJ:t"\n")\n) >lib.m3
 	+copy lib.m1 + lib.m3 + $(mktmp freecom.lib : \44(CFG) freecom_deps \n\tif exist freecom.lib \44(AR) freecom.lib /c @&&|\n+-$(OBJ:t" &\\n+-")\n| , freecom.lst \n\tif not exist freecom.lib \44(AR) freecom.lib /c @&&|\n+$(OBJ:t" &\\n+")\n| , freecom.lst \n) + lib.m2 $@
 #	+copy lib.m1 + $(mktmp freecom.lib : \44(CFG) $(OBJ:t" \\\\\\n\\t") \n\tif exist freecom.lib \44(AR) freecom.lib /c @&&|\n+-$(OBJ:t" &\\n+-")\n| , freecom.lst \n\tif not exist freecom.lib \44(AR) freecom.lib /c @&&|\n+$(OBJ:t" &\\n+")\n| , freecom.lst \n) + lib.m2 $@
diff --git a/lib/lib.mak b/lib/makefile.mak
similarity index 98%
rename from lib/lib.mak
rename to lib/makefile.mak
index 56bf727b..64af318f 100644
--- a/lib/lib.mak
+++ b/lib/makefile.mak
@@ -1,6 +1,6 @@
 #.AUTODEPEND
 
-CFG_DEPENDENCIES = lib.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=..
 !include "$(TOP)/config.mak"
@@ -255,7 +255,7 @@ echolib.bat : ../scripts/echolib.bat
 
 freecom.rsp : echolib.bat $(OBJ16) $(OBJ17) $(OBJ18) $(OBJ19) $(OBJ20) \
 $(OBJ21) $(OBJ22) $(OBJ23) $(OBJ24) $(OBJ25) $(OBJ26) $(OBJ27) $(OBJ28) \
-$(OBJ29) lib.mak
+$(OBJ29) makefile.mak
 	$(RMFILES) freecom.rsp
 	$(ECHOLIB) freecom.rsp $(OBJ1)
 	$(ECHOLIB) freecom.rsp $(OBJ2)
diff --git a/shell/command.m1 b/shell/command.m1
index 755bb91e..75abd258 100644
--- a/shell/command.m1
+++ b/shell/command.m1
@@ -1,6 +1,6 @@
 .AUTODEPEND
 
-CFG_DEPENDENCIES = COMMAND.MAK ..\strings.h
+CFG_DEPENDENCIES = makefile.mak ..\strings.h
 
 !include "..\config.mak"
 
diff --git a/shell/makefile b/shell/makefile
index 64cd8a25..f8e21662 100644
--- a/shell/makefile
+++ b/shell/makefile
@@ -94,7 +94,7 @@ PRE_OBJ = $(XMS_SWAP_PRE_OBJ)
 #	Default target
 all: com.exe
 
-dist : command.mak xms-swap.mak
+dist : makefile.mak xms-swap.mak
 
 %.obj : %.asm ; $(NASM) $(NASMFLAGS) -f obj -F borland -o $@ $< >>errlist
 
@@ -178,14 +178,14 @@ cswapc.c : ../include/cswap.h ../include/misc.h
 xms_crit.asm : ../criter/criter.asm
 
 clobber : clean
-	$(RM) $(RMFLAGS) *.com *.cln command.mak com.exe *.cfg
+	$(RM) $(RMFLAGS) *.com *.cln makefile.mak com.exe *.cfg
 
 clean :
 	$(RM) $(RMFLAGS) *.lst *.map *.bin *.bak *.las *.obj *.exe $(CFG) *.dmp com.com tags errlist
 
 .IF $(XMS_SWAP) == $(NULL)
 
-command.mak : makefile command.m1 command.m2
+makefile.mak : makefile command.m1 command.m2
 	+copy command.m1 + $(mktmp command.exe : \44(CFG) $(OBJ:t" \\\\\\n\\t") \n\t\44(LD) /m/s/l /c /d @&&|\n\44(LIBPATH)\\c0s.obj+\n$(OBJ:t"+\\n")\n) + command.m2 $@
 
 ALL_OBJ = $(XMS_SWAP_ADD_OBJ) $(OBJ:s/cb_catch.obj//)
diff --git a/shell/command.mak b/shell/makefile.mak
similarity index 95%
rename from shell/command.mak
rename to shell/makefile.mak
index 1255486d..8751d3d5 100644
--- a/shell/command.mak
+++ b/shell/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = command.mak ../strings.h
+CFG_DEPENDENCIES = makefile.mak ../strings.h
 
 TOP=..
 !include "$(TOP)/config.mak"
diff --git a/strings/strings.mak b/strings/makefile.mak
similarity index 92%
rename from strings/strings.mak
rename to strings/makefile.mak
index 5d507bd4..d754bbd1 100644
--- a/strings/strings.mak
+++ b/strings/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = strings.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=..
 MMODEL = $(FIXSTRS_MMODEL)
diff --git a/strings/strings/strings.mak b/strings/strings/makefile.mak
similarity index 98%
rename from strings/strings/strings.mak
rename to strings/strings/makefile.mak
index ef306cd6..88c5d7b0 100644
--- a/strings/strings/strings.mak
+++ b/strings/strings/makefile.mak
@@ -1,6 +1,6 @@
-CFG_DEPENDENCIES = strings.mak
+CFG_DEPENDENCIES = makefile.mak
 
-TOP=../..
+TOP = ../..
 !include "$(TOP)/config.mak"
 
 CFG:=../$(CFG)
diff --git a/suppl/suppl.mak b/suppl/makefile.mak
similarity index 78%
rename from suppl/suppl.mak
rename to suppl/makefile.mak
index 37b64645..491d1841 100644
--- a/suppl/suppl.mak
+++ b/suppl/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = suppl.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=..
 !include "$(TOP)/config.mak"
diff --git a/suppl/src/suppl.mak b/suppl/src/makefile.mak
similarity index 97%
rename from suppl/src/suppl.mak
rename to suppl/src/makefile.mak
index d7ef5100..1e11d988 100644
--- a/suppl/src/suppl.mak
+++ b/suppl/src/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = suppl.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=../..
 !include "$(TOP)/config.mak"
@@ -55,7 +55,7 @@ echolib.bat: ../../scripts/echolib.bat
 	$(CP) ..$(DIRSEP)..$(DIRSEP)scripts$(DIRSEP)echolib.bat .
 
 # Prepare Linker Response File
-objlist.txt: echolib.bat suppl.mak
+objlist.txt: echolib.bat makefile.mak
 	$(RMFILES2) objlist.txt
 	$(ECHOLIB) objlist.txt $(OBJ1)
 	$(ECHOLIB) objlist.txt $(OBJ2)
diff --git a/utils/utils.mak b/utils/makefile.mak
similarity index 79%
rename from utils/utils.mak
rename to utils/makefile.mak
index 54360473..0a0b3312 100644
--- a/utils/utils.mak
+++ b/utils/makefile.mak
@@ -1,4 +1,4 @@
-CFG_DEPENDENCIES = utils.mak
+CFG_DEPENDENCIES = makefile.mak
 
 TOP=..
 !include "$(TOP)/config.mak"