diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf18fb88c..7098f2e2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,8 @@ ELSE()
     SET( TOMAHAWK_TARGET_NAME "tomahawk" )
 ENDIF()
 
+STRING(TOLOWER "${TOMAHAWK_TARGET_NAME}" TOMAHAWK_BASE_TARGET_NAME)
+
 IF( WIN32 )
     SET( TOMAHAWK_SYSTEM "Windows" )
 ELSEIF( APPLE )
@@ -481,10 +483,10 @@ configure_file(TomahawkUse.cmake.in "${PROJECT_BINARY_DIR}/TomahawkUse.cmake" @O
 file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
 file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")
 
-SET( TOMAHAWK_LIBRARY ${TOMAHAWK_TARGET_NAME}lib )
+SET( TOMAHAWK_LIBRARY ${TOMAHAWK_BASE_TARGET_NAME}lib )
 SET( TOMAHAWK_LIBRARIES ${TOMAHAWK_LIBRARY} )
-SET( TOMAHAWK_WIDGETS_LIBRARIES ${TOMAHAWK_TARGET_NAME}-widgets )
-SET( TOMAHAWK_PLAYDARAPI_LIBRARIES ${TOMAHAWK_TARGET_NAME}-playdarapi )
+SET( TOMAHAWK_WIDGETS_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-widgets )
+SET( TOMAHAWK_PLAYDARAPI_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-playdarapi )
 
 ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src )
diff --git a/TomahawkAddPlugin.cmake b/TomahawkAddPlugin.cmake
index 2b80e80d1..50b8a0189 100644
--- a/TomahawkAddPlugin.cmake
+++ b/TomahawkAddPlugin.cmake
@@ -19,7 +19,7 @@ function(tomahawk_add_plugin)
 #     message("NO_INSTALL: ${PLUGIN_NO_INSTALL}")
 
     # create target name once for convenience
-    set(target "${TOMAHAWK_TARGET_NAME}_${PLUGIN_TYPE}_${PLUGIN_NAME}")
+    set(target "${TOMAHAWK_BASE_TARGET_NAME}_${PLUGIN_TYPE}_${PLUGIN_NAME}")
 
     # create option to disable plugins
     string(TOUPPER "${PLUGIN_TYPE}" PLUGIN_TYPE_UPPER)
diff --git a/src/accounts/google/CMakeLists.txt b/src/accounts/google/CMakeLists.txt
index 0ef6d4a2b..82d813e3d 100644
--- a/src/accounts/google/CMakeLists.txt
+++ b/src/accounts/google/CMakeLists.txt
@@ -10,5 +10,5 @@ tomahawk_add_plugin(google
     SOURCES
         GoogleWrapper.cpp
     LINK_LIBRARIES
-        ${TOMAHAWK_TARGET_NAME}_account_xmpp
+        ${TOMAHAWK_BASE_TARGET_NAME}_account_xmpp
 )
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index 2f1388375..b837eb941 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT( CrashReporter )
 cmake_policy(SET CMP0017 NEW)
 
-set(TOMAHAWK_CRASH_REPORTER_TARGET ${TOMAHAWK_TARGET_NAME}_crash_reporter)
+set(TOMAHAWK_CRASH_REPORTER_TARGET ${TOMAHAWK_BASE_TARGET_NAME}_crash_reporter)
 
 setup_qt()
 
diff --git a/src/libtomahawk-playdarapi/CMakeLists.txt b/src/libtomahawk-playdarapi/CMakeLists.txt
index a10ec6c76..96d3046f2 100644
--- a/src/libtomahawk-playdarapi/CMakeLists.txt
+++ b/src/libtomahawk-playdarapi/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set(TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET ${TOMAHAWK_TARGET_NAME}-playdarapi)
+set(TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET ${TOMAHAWK_BASE_TARGET_NAME}-playdarapi)
 
 list(APPEND ${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_SOURCES
     Api_v1.cpp
diff --git a/src/libtomahawk-widgets/CMakeLists.txt b/src/libtomahawk-widgets/CMakeLists.txt
index 6586e93b7..9b48c1bae 100644
--- a/src/libtomahawk-widgets/CMakeLists.txt
+++ b/src/libtomahawk-widgets/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set(TOMAHAWK_WIDGETS_LIBRARY_TARGET ${TOMAHAWK_TARGET_NAME}-widgets)
+set(TOMAHAWK_WIDGETS_LIBRARY_TARGET ${TOMAHAWK_BASE_TARGET_NAME}-widgets)
 
 list(APPEND ${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_SOURCES
     PlaylistDelegate.cpp
diff --git a/src/libtomahawk/accounts/configstorage/telepathy/CMakeLists.txt b/src/libtomahawk/accounts/configstorage/telepathy/CMakeLists.txt
index 9256d66fa..fb6967782 100644
--- a/src/libtomahawk/accounts/configstorage/telepathy/CMakeLists.txt
+++ b/src/libtomahawk/accounts/configstorage/telepathy/CMakeLists.txt
@@ -20,7 +20,7 @@ if( KDE4_FOUND )
         SOURCES
             KdeTelepathyConfigWidget.cpp
         LINK_LIBRARIES
-            ${TOMAHAWK_TARGET_NAME}_configstorage_telepathy
+            ${TOMAHAWK_BASE_TARGET_NAME}_configstorage_telepathy
             ${KDE4_KCMUTILS_LIBS}
     )
 endif()
diff --git a/src/tomahawk/TomahawkVersion.h.in b/src/tomahawk/TomahawkVersion.h.in
index 9eee1daff..5f5655393 100644
--- a/src/tomahawk/TomahawkVersion.h.in
+++ b/src/tomahawk/TomahawkVersion.h.in
@@ -5,6 +5,7 @@
 #cmakedefine TOMAHAWK_ORGANIZATION_DOMAIN "${TOMAHAWK_ORGANIZATION_DOMAIN}"
 #cmakedefine TOMAHAWK_APPLICATION_NAME "${TOMAHAWK_APPLICATION_NAME}"
 #cmakedefine TOMAHAWK_TARGET_NAME "${TOMAHAWK_TARGET_NAME}"
+#cmakedefine TOMAHAWK_BASE_TARGET_NAME "${TOMAHAWK_BASE_TARGET_NAME}"
 #cmakedefine TOMAHAWK_APPLICATION_PACKAGE_NAME "${TOMAHAWK_APPLICATION_PACKAGE_NAME}"
 #cmakedefine TOMAHAWK_VERSION "${TOMAHAWK_VERSION}"
 #cmakedefine TOMAHAWK_SYSTEM "${TOMAHAWK_SYSTEM}"