diff --git a/src/libtomahawk/resolvers/ScriptEngine.cpp b/src/libtomahawk/resolvers/ScriptEngine.cpp
index dd610a304..721cd9a8a 100644
--- a/src/libtomahawk/resolvers/ScriptEngine.cpp
+++ b/src/libtomahawk/resolvers/ScriptEngine.cpp
@@ -61,7 +61,7 @@ void
 ScriptEngine::javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID )
 {
     tLog() << "JAVASCRIPT:" << m_scriptPath << message << lineNumber << sourceID;
-    #ifndef DEBUG_BUILD
+    #ifdef QT_DEBUG
     JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Script Resolver Error: %1 %2 %3 %4" ).arg( m_scriptPath ).arg( message ).arg( lineNumber ).arg( sourceID ) ) );
     #endif
 }
diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
index 4c0d83edb..d5f4203ad 100644
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@@ -8,7 +8,6 @@ include( AddAppIconMacro )
 # SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
     MESSAGE( "Building in debug mode, enabling all debug updates" )
-    SET( DEBUG_BUILD ON )
 ENDIF()
 
 # build plugins
diff --git a/src/tomahawk/Config.h.in b/src/tomahawk/Config.h.in
index d552b9785..60e0c37ec 100644
--- a/src/tomahawk/Config.h.in
+++ b/src/tomahawk/Config.h.in
@@ -1,8 +1,6 @@
 #ifndef CONFIG_H_IN
 #define CONFIG_H_IN
 
-#cmakedefine DEBUG_BUILD
-
 #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
 #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}"
 
diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index cc074b76a..f4935a49a 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -1194,7 +1194,7 @@ TomahawkWindow::showAboutTomahawk()
 {
     QString head, desc;
 
-#ifdef DEBUG_BUILD
+#ifdef QT_DEBUG
     head = tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>" )
          .arg( TomahawkUtils::appFriendlyVersion() )
          .arg( qApp->applicationVersion() );