diff --git a/setup.py b/setup.py
index a50dacdc..6c232ce9 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ def _data_files():
 		yield _dirname(mo), [mo]
 
 	yield 'share/applications', ['share/applications/solaar.desktop']
-	yield autostart_path, ['share/applications/solaar.desktop']
+	yield autostart_path, ['share/applications/autostart/solaar.desktop']
 
 	del _dirname
 
diff --git a/share/applications/autostart/solaar.desktop b/share/applications/autostart/solaar.desktop
new file mode 100644
index 00000000..9740d175
--- /dev/null
+++ b/share/applications/autostart/solaar.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Solaar (window starts invisible)
+Comment=Logitech Unifying Receiver peripherals manager
+Comment[fr]=Gestionnaire de périphériques pour les récepteurs Logitech Unifying
+Comment[hr]=Upravitelj Logitechovih uređaja povezanih putem Unifying i Nano prijemnika
+Comment[ru]=Управление приёмником Logitech Unifying Receiver
+Exec=solaar --tray
+Icon=solaar
+StartupNotify=true
+Terminal=false
+Type=Application
+Keywords=logitech;unifying;receiver;mouse;keyboard;
+Categories=Utility;GTK;