diff --git a/src/CMakeLists.linux.txt b/src/CMakeLists.linux.txt
index ba02fc34c..a7cb93097 100644
--- a/src/CMakeLists.linux.txt
+++ b/src/CMakeLists.linux.txt
@@ -10,3 +10,14 @@ ELSE()
          gnutls
        )
 ENDIF()
+
+FILE( GLOB _icons "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
+FOREACH( _file ${_icons} )
+ STRING( REPLACE "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-" "" _res ${_file} )
+ STRING( REPLACE ".png" "" _res ${_res} )
+ INSTALL( FILES ${_file} RENAME tomahawk.png DESTINATION share/icons/hicolor/${_res}/apps )
+ENDFOREACH( _file )
+
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon.svg RENAME tomahawk.svg  DESTINATION share/icons/hicolor/scalable )
+
+INSTALL( FILES tomahawk.desktop DESTINATION share/applications )
diff --git a/src/tomahawk.desktop b/src/tomahawk.desktop
new file mode 100644
index 000000000..52d452c21
--- /dev/null
+++ b/src/tomahawk.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Tomahawk
+GenericName=Music Player
+TryExec=tomahawk
+Exec=tomahawk
+Comment=Tomahawk - Social Music Player
+Icon=tomahawk
+Terminal=false
+Categories=Qt;AudioVideo;Audio;Player;