diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9552fe9f0..a5cbfb0ad 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,8 @@ endif()
 option(DEBUG                "Debug mode (strict compile, all warnings)"     OFF)
 option(ACE_USE_EXTERNAL     "Use external ACE"                              OFF)
 option(POSTGRESQL           "Use PostgreSQL instead of MySQL"               OFF)
+option(BUILD_MANGOSD        "Build the main server"                         ON)
+option(BUILD_REALMD         "Build the login server"                        ON)
 option(BUILD_TOOLS          "Build the map/vmap/mmap extractors"            ON)
 option(SCRIPT_LIB_ELUNA     "Compile with support for Eluna scripts"        OFF)
 option(SCRIPT_LIB_SD3       "Compile with support for ScriptDev2 scripts"   ON)
@@ -65,6 +67,8 @@ message(
     CONF_DIR                Path to the configs, can be absolute or relative.
     DEBUG                   Debug mode (strict compile, all warnings)
     ACE_USE_EXTERNAL        Use external ACE
+    BUILD_MANGOSD           Build the main server
+    BUILD_REALMD            Build the login server
     BUILD_TOOLS             Build the map/vmap/mmap extractors
     SOAP                    Enable remote access via SOAP
    Scripting engines:
@@ -185,6 +189,18 @@ endif()
 #    message(STATUS "Enable Player Bots    : No")
 #endif()
 
+if(BUILD_MANGOSD)
+    message(STATUS "Build main server     : Yes (default)")
+else()
+    message(STATUS "Build main server     : No")
+endif()
+
+if(BUILD_REALMD)
+    message(STATUS "Build login server    : Yes (default)")
+else()
+    message(STATUS "Build login server    : No")
+endif()
+
 if(BUILD_TOOLS)
     message(STATUS "Build tools           : Yes (default)")
 else()
@@ -200,7 +216,11 @@ else()
 endif()
 
 # Add dependency path
-add_subdirectory(dep)
+if(BUILD_MANGOSD OR BUILD_TOOLS)
+    add_subdirectory(dep)
+else()
+    add_subdirectory(dep/acelite)
+endif()
 
 # Add source path
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b4f3582de..b5ef43fd5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,8 +19,10 @@
 
 # Needs to link against mangos_world.lib
 if(WIN32)
-  link_directories("${CMAKE_BINARY_DIR}/src/mangosd/${CMAKE_CFG_INTDIR}")
-  include_directories(${CMAKE_SOURCE_DIR}/dep/include)
+    if(BUILD_MANGOSD OR BUILD_TOOLS)
+        link_directories("${CMAKE_BINARY_DIR}/src/mangosd/${CMAKE_CFG_INTDIR}")
+        include_directories(${CMAKE_SOURCE_DIR}/dep/include)
+    endif()
 endif()
 
 # Build the mangos framework library
@@ -29,17 +31,21 @@ add_subdirectory(framework)
 # Build the mangos shared library
 add_subdirectory(shared)
 
-# Build the mangos game library
-add_subdirectory(game)
-
 # Build the mangos realm authentication server
-add_subdirectory(realmd)
+if(BUILD_REALMD)
+    add_subdirectory(realmd)
+endif()
 
-# Build the mangos world server
-add_subdirectory(mangosd)
+if(BUILD_MANGOSD)
+    # Build the mangos game library
+    add_subdirectory(game)
 
-# Build the selected modules
-add_subdirectory(modules)
+    # Build the mangos world server
+    add_subdirectory(mangosd)
+
+    # Build the selected modules
+    add_subdirectory(modules)
+endif()
 
 # If we want the tools for map/vmap/mmap extraction
 if(BUILD_TOOLS)
diff --git a/win/MaNGOS_EasyBuild.exe b/win/MaNGOS_EasyBuild.exe
index a89f44873..6abe1265b 100644
Binary files a/win/MaNGOS_EasyBuild.exe and b/win/MaNGOS_EasyBuild.exe differ