diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index cd5076c1b..7f900625d 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -6,7 +6,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/strawberry.spec.in
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/maketarball.sh.in
                ${CMAKE_CURRENT_SOURCE_DIR}/maketarball.sh @ONLY)
 
-if (NOT APPLE)
+if (UNIX)
   install(FILES ../data/icons/48x48/strawberry.png
     DESTINATION share/icons/hicolor/48x48/apps/
   )
@@ -22,4 +22,7 @@ if (NOT APPLE)
   install(FILES strawberry.desktop
     DESTINATION share/applications
   )
-endif (NOT APPLE)
+  install(FILES strawberry.1
+    DESTINATION share/man/man1
+  )
+endif (UNIX)
diff --git a/dist/strawberry.desktop b/dist/strawberry.desktop
index b22174a50..d49146ea4 100755
--- a/dist/strawberry.desktop
+++ b/dist/strawberry.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.1.1
+Version=1.0
 Type=Application
 Name=Strawberry
 GenericName=Strawberry Music Player
@@ -10,30 +10,4 @@ Icon=strawberry
 Terminal=false
 Categories=AudioVideo;Player;Qt;Audio;
 StartupNotify=false
-MimeType=application/ogg;application/x-ogg;application/x-ogm-audio;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;video/x-ms-asf;x-content/audio-player;x-scheme-handler/zune;x-scheme-handler/itpc;x-scheme-handler/itms;x-scheme-handler/feed;
-X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Previous;Next;
-
-[Play Shortcut Group]
-Name=Play
-Exec=strawberry --play
-TargetEnvironment=Unity
-
-[Pause Shortcut Group]
-Name=Pause
-Exec=strawberry --pause
-TargetEnvironment=Unity
-
-[Stop Shortcut Group]
-Name=Stop
-Exec=strawberry --stop
-TargetEnvironment=Unity
-
-[Previous Shortcut Group]
-Name=Previous
-Exec=strawberry --previous
-TargetEnvironment=Unity
-
-[Next Shortcut Group]
-Name=Next
-Exec=strawberry --next
-TargetEnvironment=Unity
+MimeType=x-content/audio-player;application/ogg;application/x-ogg;application/x-ogm-audio;audio/flac;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/vorbis;audio/vnd.rn-realaudio;audio/x-wav;audio/x-flac;audio/x-oggflac;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;video/x-ms-asf;
diff --git a/dist/strawberry.spec.in b/dist/strawberry.spec.in
index 1b73aacd6..c6d64c95a 100644
--- a/dist/strawberry.spec.in
+++ b/dist/strawberry.spec.in
@@ -33,8 +33,14 @@ BuildRequires:  libQt5Core-devel
 BuildRequires:  libQt5Gui-devel
 BuildRequires:  libQt5Widgets-devel
 BuildRequires:  libQt5Network-devel
+BuildRequires:  libQt5Concurrent-devel
 BuildRequires:  libQt5Sql-devel
 BuildRequires:  libQt5Xml-devel
+BuildRequires:  libQt5OpenGL-devel
+BuildRequires:  libQt5Test-devel
+BuildRequires:  libQt5WebKit5-devel
+BuildRequires:  libQt5WebKitWidgets-devel
+BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libQt5Gui-private-headers-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  update-desktop-files
@@ -52,15 +58,15 @@ Requires:       libmtp
 Requires:       libpulse
 Requires:       libxml
 Requires:       Qt5Core
-Requires:       Qt5X11Extras
-Requires:       Qt5Network
-Requires:       Qt5Xml
-Requires:       Qt5Widgets
-Requires:       Qt5Concurrent
 Requires:       Qt5Gui
+Requires:       Qt5Widgets
+Requires:       Qt5Network
+Requires:       Qt5Concurrent
 Requires:       Qt5Sql
+Requires:       Qt5Xml
 Requires:       Qt5OpenGL
 Requires:       Qt5Test
+Requires:       Qt5X11Extras
 Requires:       Qt5WebKit
 Requires:       Qt5WebKitWidgets