diff --git a/contrib/extractor/CMakeLists.txt b/contrib/extractor/CMakeLists.txt
index c36061e51..155495fe2 100644
--- a/contrib/extractor/CMakeLists.txt
+++ b/contrib/extractor/CMakeLists.txt
@@ -8,7 +8,8 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8)
+
 project (MANGOS_MAP_EXTRACTOR)
 
 add_subdirectory (loadlib)
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
index 0fff1085e..88af5243a 100644
--- a/contrib/mmap/CMakeLists.txt
+++ b/contrib/mmap/CMakeLists.txt
@@ -8,7 +8,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8)
 
 project( MoveMapGen )
 
@@ -26,9 +26,9 @@ include_directories(
     ../../src/game
     ../../src/game/vmap
     ../../dep/include/g3dlite
-    ../../src/framework
     ../../dep/ACE_wrappers
     ../../objdir/dep/ACE_wrappers
+    ../../src/framework
     ../../dep/recastnavigation/Detour/Include
     ../../dep/recastnavigation/Recast/Include
     ../../dep/src/zlib
diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
index bb5775fe2..a2682ab66 100644
--- a/contrib/vmap_assembler/CMakeLists.txt
+++ b/contrib/vmap_assembler/CMakeLists.txt
@@ -8,7 +8,8 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8)
+
 project (MANGOS_VMAP_ASSEMB_IO)
 
 set(CMAKE_VERBOSE_MAKEFILE true)
@@ -85,4 +86,3 @@ target_link_libraries(vmap_assembler vmap)
 
 # add_executable(vmap_test coordinate_test.cpp)
 # target_link_libraries(vmap_test vmap)
-
diff --git a/contrib/vmap_assembler/VC100/.gitignore b/contrib/vmap_assembler/VC100/.gitignore
new file mode 100644
index 000000000..a57495c79
--- /dev/null
+++ b/contrib/vmap_assembler/VC100/.gitignore
@@ -0,0 +1,2 @@
+*.user
+bin
diff --git a/contrib/vmap_assembler/VC110/.gitignore b/contrib/vmap_assembler/VC110/.gitignore
new file mode 100644
index 000000000..a57495c79
--- /dev/null
+++ b/contrib/vmap_assembler/VC110/.gitignore
@@ -0,0 +1,2 @@
+*.user
+bin
diff --git a/contrib/vmap_extractor/CMakeLists.txt b/contrib/vmap_extractor/CMakeLists.txt
index 2cb2cea1f..f8a4aeb24 100644
--- a/contrib/vmap_extractor/CMakeLists.txt
+++ b/contrib/vmap_extractor/CMakeLists.txt
@@ -8,9 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
-project (MANGOS_VMAP_EXTRACT_IO)
+cmake_minimum_required (VERSION 2.8)
 
+project (MANGOS_VMAP_EXTRACT_IO)
 
 # uncomment next line to disable debug mode
 ADD_DEFINITIONS("-DIOMAP_DEBUG")
@@ -20,6 +20,6 @@ ADD_DEFINITIONS("-Wall")
 ADD_DEFINITIONS("-ggdb")
 ADD_DEFINITIONS("-O3")
 
-include_directories(../../dep/libmpq)
+include_directories(${CMAKE_SOURCE_DIR}/../../dep/libmpq)
 
 add_subdirectory(vmapextract)
diff --git a/contrib/vmap_extractor/README b/contrib/vmap_extractor/README
index 64cad0def..a7bc945c6 100644
--- a/contrib/vmap_extractor/README
+++ b/contrib/vmap_extractor/README
@@ -9,7 +9,7 @@ Linux:
 	$ ./configure
 	$ make
 
-	After that, cd to contrib/vmap_extractor_v4/ and execute:
+	After that, cd to contrib/vmap_extractor/ and execute:
 
 	$ cmake .
 	$ make
@@ -30,8 +30,8 @@ Windows:
 
 1. Building
 
-	Just build the solution in contrib\vmap_extractor_v2\win
-	Resulting binaries will be in contrib\vmap_extractor_v2\bin\$(PlatformName)_$(ConfigurationName)
+	Just build the solution in contrib\vmap_extractor\win
+	Resulting binaries will be in contrib\vmap_extractor\bin\$(PlatformName)_$(ConfigurationName)
 
 2. Extracting
 
diff --git a/contrib/vmap_extractor/make_vmaps.bat b/contrib/vmap_extractor/make_vmaps.bat
index aca4c651b..2b7f47dc5 100644
--- a/contrib/vmap_extractor/make_vmaps.bat
+++ b/contrib/vmap_extractor/make_vmaps.bat
@@ -10,7 +10,7 @@ cls
 echo.
 echo.
 echo.
-IF EXIST buildings\dir (ECHO The buildings folder already exist do you want to delete it?
+IF EXIST Buildings\dir (ECHO The Buildings folder already exist do you want to delete it?
 echo If YES hit Enter to continue if no CLOSE the program now! . . .
 pause>nul
 DEL /S /Q buildings)
diff --git a/contrib/vmap_extractor/vmapextract/CMakeLists.txt b/contrib/vmap_extractor/vmapextract/CMakeLists.txt
index 37937b319..07994a16c 100644
--- a/contrib/vmap_extractor/vmapextract/CMakeLists.txt
+++ b/contrib/vmap_extractor/vmapextract/CMakeLists.txt
@@ -8,9 +8,10 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8)
+
 project (MANGOS_IOMAP_EXTRACTOR)
 
-LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../../dep/libmpq/libmpq/.libs/ )
+LINK_DIRECTORIES( ${LINK_DIRECTORIES} ${CMAKE_SOURCE_DIR}/../../dep/libmpq/libmpq/.libs/ )
 add_executable(vmapextractor adtfile.cpp  dbcfile.cpp gameobject_extract.cpp model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
 target_link_libraries(vmapextractor libmpq.a bz2 z)