diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ffc1c53df..5b3e9621ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 INCLUDE(CMakeDependentOption)
 
 OPTION(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON)
-OPTION(KWIN_BUILD_OXYGEN "Enable building of default decoration Oxygen" OFF)
+OPTION(KWIN_BUILD_OXYGEN "Enable building of default decoration Oxygen" ON)
 OPTION(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." OFF)
 OPTION(KWIN_MOBILE_EFFECTS "Only build effects relevant for mobile devices" OFF)
 OPTION(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON)
diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt
index a9a84db80b..49a7112e55 100644
--- a/clients/oxygen/CMakeLists.txt
+++ b/clients/oxygen/CMakeLists.txt
@@ -1,8 +1,8 @@
 ########### add version number into compilation defines
 # FIXME: CPACK_PACKAGE_VERSION_* are empty
 add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\")
-add_subdirectory( config )
-add_subdirectory( demo )
+# add_subdirectory( config )
+# add_subdirectory( demo )
 add_subdirectory( data )
 
 include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)