diff --git a/CMakeLists.txt b/CMakeLists.txt
index 160b71a6f..a03f7d6cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ OPTION(BUILD_DFHACK_DOCUMENTATION "Create doxygen documentation for developers"
 OPTION(BUILD_DFHACK_EXAMPLES "Build example tools" OFF)
 OPTION(BUILD_DFHACK_PLAYGROUND "Build tools from the playground folder" OFF)
 OPTION(BUILD_DFHACK_C_BINDIGS "Build the C portion of the library" ON)
+OPTION(BUILD_OFFSET_EDITOR "Build the Offset GUI editor (not ready for use)." OFF)
 
 include_directories (${CMAKE_SOURCE_DIR}/library/include/)
 include_directories (${CMAKE_SOURCE_DIR}/library/shm/)
@@ -33,7 +34,11 @@ include_directories (${CMAKE_SOURCE_DIR}/library/depends/tinyxml/)
 include_directories (${CMAKE_SOURCE_DIR}/library/depends/argstream/)
 
 add_subdirectory (library)
-add_subdirectory (offsetedit)
+
+IF(BUILD_OFFSET_EDITOR)
+    add_subdirectory (offsetedit)
+ENDIF(BUILD_OFFSET_EDITOR)
+
 add_subdirectory (library/shm)
 add_subdirectory (tools/examples)
 add_subdirectory (tools/playground)
diff --git a/offsetedit/CMakeLists.txt b/offsetedit/CMakeLists.txt
index 246f3ba3d..f8065bc4c 100644
--- a/offsetedit/CMakeLists.txt
+++ b/offsetedit/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 project(dfoffsetedit)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 QUIET)
diff --git a/offsetedit/src/CMakeLists.txt b/offsetedit/src/CMakeLists.txt
index 0804dd66e..9a2218413 100644
--- a/offsetedit/src/CMakeLists.txt
+++ b/offsetedit/src/CMakeLists.txt
@@ -18,7 +18,7 @@ SET( dfoffsetedit_RCS
 # in result dfoffsetedit_RC_SRCS variable will contain paths to files produced by rcc
 QT4_ADD_RESOURCES( dfoffsetedit_RC_SRCS ${dfoffsetedit_RCS} )
 
-QT4_WRAP_UI(dfoffsetedit_UI_h ${dfedit_UI})
+QT4_WRAP_UI(dfoffsetedit_UI_h ${dfoffsetedit_UI})
 qt4_automoc(${dfoffsetedit_SRCS})
 
 add_executable(dfoffsetedit ${dfoffsetedit_SRCS} ${dfoffsetedit_RC_SRCS} ${dfoffsetedit_UI_h})