diff --git a/.gitignore b/.gitignore
index 2513bbedac..a2a216cd62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,6 +139,14 @@ Thumbs.db
 /yamlupgrade.bat
 /navigenerator.bat
 
+# Linux script tools
+/athena-start
+/configure
+/configure.ac
+/function.sh
+/install.sh
+/uninstall.sh
+
 # dlls
 /libmysql.dll
 /pcre8.dll
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 67442585e8..74dc3d9c3d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -11,11 +11,30 @@ function(copy_to_source_dir FILENAMES)
     endforeach()
 endfunction()
 
-set(FILES_TO_COPY
-"serv.bat"
-"logserv.bat"
-"charserv.bat"
-"mapserv.bat"
-    "runserver.bat"
+if(WIN32)
+    set(WIN_FILES_TO_COPY
+        "charserv.bat"
+        "csv2yaml.bat"
+        "logserv.bat"
+        "mapcache.bat"
+        "mapserv.bat"
+        "runserver.bat"
+        "serv.bat"
+        "webserv.bat"
+        "yaml2sql.bat"
+        "yamlupgrade.bat"
+        "navigenerator.bat"
+    )
+    copy_to_source_dir("${WIN_FILES_TO_COPY}")
+else()
+    set(LINUX_FILES_TO_COPY
+        "athena-start"
+        "configure"
+        "configure.ac"
+        "function.sh"
+        "install.sh"
+        "uninstall.sh"
+    )
 
-)
\ No newline at end of file
+    copy_to_source_dir("${LINUX_FILES_TO_COPY}")
+endif()
\ No newline at end of file
diff --git a/athena-start b/tools/athena-start
similarity index 100%
rename from athena-start
rename to tools/athena-start
diff --git a/configure b/tools/configure
similarity index 100%
rename from configure
rename to tools/configure
diff --git a/configure.ac b/tools/configure.ac
similarity index 100%
rename from configure.ac
rename to tools/configure.ac
diff --git a/function.sh b/tools/function.sh
similarity index 100%
rename from function.sh
rename to tools/function.sh
diff --git a/install.sh b/tools/install.sh
similarity index 100%
rename from install.sh
rename to tools/install.sh
diff --git a/uninstall.sh b/tools/uninstall.sh
similarity index 100%
rename from uninstall.sh
rename to tools/uninstall.sh