diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2d6822..c5654ede 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ project (HLSDK-XASH3D)
 option(USE_VGUI "Enable VGUI1. UNDONE" OFF)
 option(USE_VGUI2 "Enable VGUI2. UNDONE" OFF)
 option(USE_VOICEMGR "Enable VOICE MANAGER." OFF)
-option(BUILD_CLIENT "Build client dll" ON)
+option(BUILD_CLIENT "Build client dll" OFF)
 option(BUILD_SERVER "Build server dll" ON)
 
 #-----------------
@@ -59,4 +59,4 @@ endif()
 
 if(NOT BUILD_SERVER AND NOT BUILD_CLIENT)
 	error("Nothing to build")
-endif()
\ No newline at end of file
+endif()
diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt
index cc0063b4..67635f12 100644
--- a/dlls/CMakeLists.txt
+++ b/dlls/CMakeLists.txt
@@ -42,6 +42,20 @@ set (SVDLL_SOURCES
 	bmodels.cpp
 	bullsquid.cpp
 	buttons.cpp
+	bubblemod/BMOD_boxmarker.cpp
+	bubblemod/BMOD_CameraPoint.cpp
+	bubblemod/BMOD_egon.cpp
+	bubblemod/BMOD_flyingcrowbar.cpp
+	bubblemod/BMOD_gamerules.cpp
+#	bubblemod/BMOD_hornetgun.cpp
+	bubblemod/BMOD_messaging.cpp
+	bubblemod/BMOD_player.cpp
+	bubblemod/BMOD_rune.cpp
+	bubblemod/BMOD_snarkmine.cpp
+	bubblemod/BMOD_squeakgrenade.cpp
+	bubblemod/BMOD_tripmines.cpp
+	bubblemod/BMOD_util.cpp
+	bubblemod/BMOD_zapgunrift.cpp
 	cbase.cpp
 	client.cpp
 	combat.cpp
@@ -51,7 +65,7 @@ set (SVDLL_SOURCES
 	defaultai.cpp
 	doors.cpp
 	effects.cpp
-	egon.cpp
+#	egon.cpp
 	explode.cpp
 	flyingmonster.cpp
 	func_break.cpp
@@ -131,7 +145,7 @@ set (SVDLL_SOURCES
 	../pm_shared/pm_shared.c
 )
 	
-include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
+include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public bubblemod )
 
 if(USE_VOICEMGR)
 	set(SVDLL_SOURCES