diff --git a/CMakeLists.txt b/CMakeLists.txt
index fec9d7802..487ad4273 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,16 @@ SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
+IF( WIN32 )
+    SET( TOMAHAWK_SYSTEM "Windows" )
+ELSEIF( APPLE )
+    SET( TOMAHAWK_SYSTEM "OS X" )
+ELSEIF( UNIX )
+    SET( TOMAHAWK_SYSTEM "Linux")
+ELSE()
+    SET( TOMAHAWK_SYSTEM "Uknown Platform, please let the Tomahawk team know, this actually happened" )
+ENDIF()
+
 SET( TOMAHAWK_VERSION_MAJOR 0 )
 SET( TOMAHAWK_VERSION_MINOR 5 )
 SET( TOMAHAWK_VERSION_PATCH 99 )
diff --git a/src/Config.h.in b/src/Config.h.in
index 7e838925d..159c61a31 100644
--- a/src/Config.h.in
+++ b/src/Config.h.in
@@ -1,11 +1,17 @@
 #ifndef CONFIG_H_IN
 #define CONFIG_H_IN
 
+#cmakedefine TOMAHAWK_ORGANIZATION_NAME "${TOMAHAWK_ORGANIZATION_NAME}"
+#cmakedefine TOMAHAWK_ORGANIZATION_DOMAIN "${TOMAHAWK_ORGANIZATION_DOMAIN}"
+#cmakedefine TOMAHAWK_APPLICATION_NAME "${TOMAHAWK_APPLICATION_NAME}"
+#cmakedefine TOMAHAWK_VERSION "${TOMAHAWK_VERSION}"
+#cmakedefine TOMAHAWK_SYSTEM "${TOMAHAWK_SYSTEM}"
+
 #cmakedefine DEBUG_BUILD
 
 #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
 #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}"
-#define CMAKE_SYSTEM "${CMAKE_SYSTEM}"
+
 
 #cmakedefine LION
 #cmakedefine SNOW_LEOPARD
diff --git a/src/DiagnosticsDialog.cpp b/src/DiagnosticsDialog.cpp
index 339f74ebe..015e3ce2e 100644
--- a/src/DiagnosticsDialog.cpp
+++ b/src/DiagnosticsDialog.cpp
@@ -62,7 +62,8 @@ DiagnosticsDialog::updateLogView()
     QString log;
 
     log.append( QString( "TOMAHAWK DIAGNOSTICS LOG -%1 \n\n" ).arg( QDateTime::currentDateTime().toString() ) );
-    log.append( "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n\n" );
+    log.append( "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n" );
+    log.append( "PLATFORM: " TOMAHAWK_SYSTEM "\n\n");
     log.append( "NETWORK:\n    General:\n" );
 
     if ( Servent::instance()->visibleExternally() )
diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp
index 646ca3d33..7f4e70d91 100644
--- a/src/accounts/xmpp/sip/XmppSip.cpp
+++ b/src/accounts/xmpp/sip/XmppSip.cpp
@@ -138,7 +138,7 @@ XmppSipPlugin::XmppSipPlugin( Account* account )
 #endif
 
     // setup disco
-    m_client->disco()->setSoftwareVersion( "Tomahawk Player", TOMAHAWK_VERSION, CMAKE_SYSTEM );
+    m_client->disco()->setSoftwareVersion( "Tomahawk Player", TOMAHAWK_VERSION, TOMAHAWK_SYSTEM );
     m_client->disco()->addIdentity( Jreen::Disco::Identity( "client", "type", "tomahawk", "en" ) );
     m_client->disco()->addFeature( TOMAHAWK_FEATURE );