diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt
new file mode 100644
index 000000000..920767f5c
--- /dev/null
+++ b/src/BlockEntities/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+cmake_minimum_required (VERSION 2.6)
+project (MCServer)
+
+include_directories ("${PROJECT_SOURCE_DIR}/../")
+
+file(GLOB SOURCE
+    "*.cpp"
+)
+
+add_library(BlockEntities ${SOURCE})
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index 6fededb65..082ff41ac 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -4,4 +4,8 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-add_library(Blocks BlockHandler)
+file(GLOB SOURCE
+    "*.cpp"
+)
+
+add_library(Blocks ${SOURCE})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f94cbb85a..6ea2eb740 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,7 @@ add_subdirectory(Mobs)
 add_subdirectory(Entities)
 add_subdirectory(Simulator)
 add_subdirectory(UI)
+add_subdirectory(BlockEntities)
 
 
 file(GLOB SOURCE
@@ -33,4 +34,4 @@ add_executable(../MCServer/MCServer ${SOURCE})
 
 target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks)
 target_link_libraries(../MCServer/MCServer Protocol Generating WorldStorage jsoncpp cryptopp)
-target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua)
+target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua BlockEntities)