diff --git a/CMakeLists.txt b/CMakeLists.txt
index 757e2167e..a835d0016 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,17 +13,16 @@ endif(IS_64_SYSTEM)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/UUID.h
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/UUID.cpp
   COMMAND ${CMAKE_COMMAND} -P
     ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake
   DEPENDS
     ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake
-    ${CMAKE_SOURCE_DIR}/Util/UUID.cpp
+    ${CMAKE_SOURCE_DIR}/Util/UUID.cpp.in
   COMMENT "Configuring UUID.cpp"
   VERBATIM)
 
-add_custom_target(UUIDConfigure ALL
-  DEPENDS ${CMAKE_SOURCE_DIR}/Util/UUID.h ${CMAKE_SOURCE_DIR}/Util/GraphLoader.h)
+add_custom_target(UUIDConfigure ALL DEPENDS ${CMAKE_SOURCE_DIR}/Util/UUID.cpp )
 
 set(BOOST_COMPONENTS filesystem regex system thread)
 
diff --git a/cmake/UUID-Config.cmake b/cmake/UUID-Config.cmake
index 3da918765..d373dc89f 100644
--- a/cmake/UUID-Config.cmake
+++ b/cmake/UUID-Config.cmake
@@ -9,4 +9,4 @@ file(MD5 ${CMAKE_SOURCE_DIR}/../DataStructures/NodeInformationHelpDesk.h MD5NODE
 file(MD5 ${CMAKE_SOURCE_DIR}/../Util/GraphLoader.h MD5GRAPH)
 file(MD5 ${CMAKE_SOURCE_DIR}/../Server/DataStructures/QueryObjectsStorage.cpp MD5OBJECTS)
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp.in ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp )
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp.in ${CMAKE_SOURCE_DIR}/../Util/UUID.cpp @ONLY)