diff --git a/Makefile b/Makefile
index ba80647..0632935 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,7 @@ debug:
 
 install:
 	# Create directories
+	install -d $(DESTDIR)/etc/xdg/
 	install -d $(DESTDIR)$(PREFIX)/bin/
 	install -d $(DESTDIR)$(PREFIX)/share/applications/
 	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
@@ -117,7 +118,8 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/
 
 	# Install desktop files
-	install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/
+	install -m 644 data/autostart/*.desktop $(DESTDIR)/etc/xdg/
+	install -m 644 data/*.desktop           $(DESTDIR)$(PREFIX)/share/applications/
 
 	# Install icons, 16x16
 	install -m 644 resources/16x16/cadence.png             $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
diff --git a/data/99cadence-session-start b/data/99cadence-session-start
index 558d2fa..751c480 100644
--- a/data/99cadence-session-start
+++ b/data/99cadence-session-start
@@ -1,9 +1,5 @@
 # Cadence Session Startup
 # Part 2 - Start JACK (or not), according to user settings
 
-INSTALL_PREFIX="X-PREFIX-X"
-
-CADENCE_SESSION="$INSTALL_PREFIX/bin/cadence-session-start --system-start"
-exec $CADENCE_SESSION &
-
-unset INSTALL_PREFIX
+# Not used anymore
+# see /etc/xdg/autostart/cadence-session-start.desktop
diff --git a/data/autostart/cadence-session-start.desktop b/data/autostart/cadence-session-start.desktop
new file mode 100644
index 0000000..94fbb29
--- /dev/null
+++ b/data/autostart/cadence-session-start.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Cadence session startup
+Comment=Cadence session startup
+Exec=cadence-session-start --system-start
+Icon=cadence
+Terminal=false
+GenericName=