diff --git a/Makefile b/Makefile
index 44ff4a7..91b76e8 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,7 @@ install:
 	# Create directories
 	install -d $(DESTDIR)$(PREFIX)/bin/
 	install -d $(DESTDIR)$(PREFIX)/share/applications/
+	install -d $(DESTDIR)$(PREFIX)/share/autostart/
 	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
 	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
 	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
@@ -119,7 +120,8 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/
 
 	# Install desktop files
-	install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/
+	install -m 644 data/*.desktop           $(DESTDIR)$(PREFIX)/share/applications/
+	install -m 644 data/autostart/*.desktop $(DESTDIR)$(PREFIX)/share/autostart/
 
 	# 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..20fa6ab 100644
--- a/data/99cadence-session-start
+++ b/data/99cadence-session-start
@@ -1,9 +1,14 @@
 # Cadence Session Startup
 # Part 2 - Start JACK (or not), according to user settings
 
+# Do not use this for KDE
+if [ ! -z "$KDEDIRS" ]; then
+
 INSTALL_PREFIX="X-PREFIX-X"
 
 CADENCE_SESSION="$INSTALL_PREFIX/bin/cadence-session-start --system-start"
 exec $CADENCE_SESSION &
 
 unset INSTALL_PREFIX
+
+fi
diff --git a/data/autostart/cadence-session-start.desktop b/data/autostart/cadence-session-start.desktop
new file mode 100644
index 0000000..8deffc4
--- /dev/null
+++ b/data/autostart/cadence-session-start.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Service
+Icon=cadence
+Exec=cadence-session-start --system-start
+X-KDE-StartupNotify=false
+OnlyShowIn=KDE;
+Name=Cadence session startup
+Hidden=false
+NoDisplay=true