diff --git a/CMakeLists.txt b/CMakeLists.txt
index 502458147..9c6d07f24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,11 +123,8 @@ if(NO_MSG_HANDLER)
    add_definitions(-DNO_MSG_HANDLER=1)
 endif()
 
-# this option builds the updater
-option(BUILD_UPDATER "BUILD_UPDATER" OFF)
 if(BUILD_UPDATER)
    message("Compiling with updater")
-   add_definitions(-DBUILD_UPDATER=1)
 else()
    message("Compiling without updater")
 endif()
diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake
index 70725bd33..69464cfcc 100644
--- a/NEXTCLOUD.cmake
+++ b/NEXTCLOUD.cmake
@@ -30,7 +30,7 @@ option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 #set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
 
 ## Updater options
-option( BUILD_UPDATER "Build updater" OFF )
+option( BUILD_UPDATER "Build updater" ON )
 
 option( WITH_PROVIDERS "Build with providers list" ON )
 
diff --git a/config.h.in b/config.h.in
index 1e8cb6e65..c62386cc6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -42,4 +42,6 @@
 
 #cmakedefine01 GUI_TESTING
 
+#cmakedefine BUILD_UPDATER "@BUILD_UPDATER@"
+
 #endif
diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 058bdf1d6..589ab7afe 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -36,8 +36,6 @@
 #include "common/utility.h"
 #include "logger.h"
 
-#include "config.h"
-
 #include "legalnotice.h"
 
 #include <QFileDialog>
diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h
index 06675c8cc..8243fb241 100644
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -15,6 +15,8 @@
 #ifndef MIRALL_GENERALSETTINGS_H
 #define MIRALL_GENERALSETTINGS_H
 
+#include "config.h"
+
 #include <QWidget>
 #include <QPointer>