diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fb79881..b1632ce0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ set(EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
+set(Cotire_ENABLED TRUE)
+
 ##########################################################################
 # Boost stuff
 
@@ -30,7 +32,10 @@ set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
 include( "cmake/boost.cmake" )
 include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
-include( "cmake/cotire.cmake" )
+
+if(Cotire_ENABLED)
+	include( "cmake/cotire.cmake" )
+endif()
 ##############################
 #             Git            #
 ##############################
diff --git a/src/libraries b/src/libraries
index 67b949df..4a9d6da5 160000
--- a/src/libraries
+++ b/src/libraries
@@ -1 +1 @@
-Subproject commit 67b949dfe3ffbbba7963b0861670ab4bb1819991
+Subproject commit 4a9d6da513b1bd1f2a50e6780792df0a56120f46
diff --git a/src/servers/Scripts/CMakeLists.txt b/src/servers/Scripts/CMakeLists.txt
index 3d03ca0d..f6eee55c 100644
--- a/src/servers/Scripts/CMakeLists.txt
+++ b/src/servers/Scripts/CMakeLists.txt
@@ -12,6 +12,7 @@ set(RUNTIME_OUTPUT_DIRECTORY "${SCRIPT_LIB_DIR}")
 
 
 file(GLOB children "${CMAKE_CURRENT_SOURCE_DIR}/*" )
+
 foreach(_scriptDir ${children})
     get_filename_component(_name "${_scriptDir}" NAME_WE)
     if(IS_DIRECTORY ${_scriptDir} AND NOT ${_name} MATCHES "CMakeFiles" AND NOT ${_name} MATCHES "\\.dir$")
@@ -57,8 +58,9 @@ foreach(_scriptDir ${children})
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
-        cotire("script_${_name}")
-
+		if( Cotire_ENABLED )
+			cotire("script_${_name}")
+		endif()
         if(MSVC)
             add_custom_command(TARGET "script_${_name}" POST_BUILD
                 COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp"
diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt
index f937d857..b2171acd 100644
--- a/src/servers/sapphire_lobby/CMakeLists.txt
+++ b/src/servers/sapphire_lobby/CMakeLists.txt
@@ -27,4 +27,7 @@ else()
 endif()
 
 target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
-cotire( sapphire_lobby )
+
+if(Cotire_ENABLED)
+  cotire( sapphire_lobby )
+endif()
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index 9e4e7c0c..56eb9075 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -67,6 +67,6 @@ target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
-if (UNIX)
+if (UNIX AND Cotire_ENABLED)
   cotire( sapphire_zone )
 endif()