diff --git a/doc/.mailmap b/.mailmap
similarity index 100%
rename from doc/.mailmap
rename to .mailmap
diff --git a/.travis/linux.win32.script.sh b/.travis/linux.win32.script.sh
index f059301d682..aac4f3addb3 100644
--- a/.travis/linux.win32.script.sh
+++ b/.travis/linux.win32.script.sh
@@ -1,2 +1,2 @@
 export CMAKE_OPTS="-DUSE_WERROR=ON"
-../cmake/scripts/build_mingw32 || ../cmake/scripts/build_mingw32
+../buildtools/build_mingw32 || ../buildtools/build_mingw32
diff --git a/.travis/linux.win64.script.sh b/.travis/linux.win64.script.sh
index 32388ab8d52..9b39ad64765 100644
--- a/.travis/linux.win64.script.sh
+++ b/.travis/linux.win64.script.sh
@@ -1,2 +1,2 @@
 export CMAKE_OPTS="-DUSE_WERROR=ON"
-../cmake/scripts/build_mingw64 || ../cmake/scripts/build_mingw64
+../buildtools/build_mingw64 || ../buildtools/build_mingw64
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04f737b1e27..3fd6e1e45ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,7 +407,6 @@ FIND_PACKAGE(Git)
 IF(GIT_FOUND)
 	SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS")
 	EXECUTE_PROCESS(
-		COMMAND "${GIT_EXECUTABLE}" config mailmap.file doc/.mailmap 
 		COMMAND "${GIT_EXECUTABLE}" shortlog -sne 
 		COMMAND cut -c8-
 		OUTPUT_FILE "${CONTRIBUTORS}"
@@ -499,7 +498,7 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND make clean
 			COMMAND rm -rf "${TMP}"
 			COMMAND mkdir -p "${TMP}"
-			COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL README.md TODO "${TMP}"
+			COMMAND cp CMakeLists.txt LICENSE.txt INSTALL README.md "${TMP}"
 			COMMAND cp -r buildtools cmake data doc include plugins src "${TMP}"
 			COMMAND rm -rf `find "${TMP}" -name cmake_install.cmake` `find "${TMP}" -name Makefile` `find "${TMP}" -type d -name CMakeFiles` "${TMP}/CMakeCache.txt"
 			COMMAND tar cjf lmms-${VERSION}-src.tar.bz2 "${TMP}"
diff --git a/cmake/scripts/build_mingw32 b/buildtools/build_mingw32
similarity index 100%
rename from cmake/scripts/build_mingw32
rename to buildtools/build_mingw32
diff --git a/cmake/scripts/build_mingw64 b/buildtools/build_mingw64
similarity index 100%
rename from cmake/scripts/build_mingw64
rename to buildtools/build_mingw64