diff --git a/mapcache.bat b/mapcache.bat
new file mode 100644
index 0000000000..90ae0116e0
--- /dev/null
+++ b/mapcache.bat
@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL serv.bat mapcache.exe Map-Cache
diff --git a/serv.bat b/serv.bat
index 77000c66ed..e33f84f13d 100755
--- a/serv.bat
+++ b/serv.bat
@@ -24,6 +24,7 @@ REM Windows 2000, XP, Vista, 7
 :RESTART_NT
 REM There is no CHOICE in 2000 and XP, but you get asked whether to
 REM abort the batch file, when pressing Ctrl+C in PING.
+IF "%1"=="mapcache.exe" GOTO END
 ECHO Restarting in 15 seconds, press Ctrl+C to cancel.
 PING -n 15 127.0.0.1 > NUL