diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 9052903b1ed..2e9cb3591f1 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
+# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,18 +10,18 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 cmake_minimum_required (VERSION 2.6)
-project (MANGOS_MAP_EXTRACTOR)
+project (TRINITY_MAP_EXTRACTOR)
+
+file(GLOB sources *.cpp)
 
-add_subdirectory (libmpq)
 add_subdirectory (loadlib)
 
-include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) 
-include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) 
+include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
+include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
 
-link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) 
-link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) 
+link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
+link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map-extractor/loadlib)
 
-add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp)
+add_executable (trinity-map_extractor ${sources})
 
-target_link_libraries (ad libmpq)
-target_link_libraries (ad loadlib)
+target_link_libraries (trinity-map_extractor libmpq loadlib)