diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
index be8813227..60ef9899c 100644
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@@ -6,7 +6,7 @@ include( AddAppIconMacro )
 # SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 # SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 # SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
-IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     MESSAGE( "Building in debug mode, enabling all debug updates" )
 ENDIF()
 
diff --git a/src/tomahawk/CMakeLists.win32.cmake b/src/tomahawk/CMakeLists.win32.cmake
index 795bcbade..b7a2e2a78 100644
--- a/src/tomahawk/CMakeLists.win32.cmake
+++ b/src/tomahawk/CMakeLists.win32.cmake
@@ -1,5 +1,3 @@
-SET( CMAKE_BUILD_TYPE "Release" )
-
 ADD_DEFINITIONS( /DNOMINMAX )
 ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
 ADD_DEFINITIONS( -static-libgcc )