diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6484ea191d2..04f737b1e27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,7 +407,8 @@ FIND_PACKAGE(Git)
 IF(GIT_FOUND)
 	SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS")
 	EXECUTE_PROCESS(
-		COMMAND "${GIT_EXECUTABLE}" shortlog -sne
+		COMMAND "${GIT_EXECUTABLE}" config mailmap.file doc/.mailmap 
+		COMMAND "${GIT_EXECUTABLE}" shortlog -sne 
 		COMMAND cut -c8-
 		OUTPUT_FILE "${CONTRIBUTORS}"
 		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
diff --git a/.mailmap b/doc/.mailmap
similarity index 100%
rename from .mailmap
rename to doc/.mailmap