diff --git a/Makefile b/Makefile
index 1b8b447..ba80647 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,6 @@ 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/
@@ -118,8 +117,7 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/
 
 	# Install desktop files
-	install -m 644 data/*.desktop           $(DESTDIR)$(PREFIX)/share/applications/
-	install -m 644 data/autostart/*.desktop $(DESTDIR)$(PREFIX)/share/autostart/
+	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 20fa6ab..558d2fa 100644
--- a/data/99cadence-session-start
+++ b/data/99cadence-session-start
@@ -1,14 +1,9 @@
 # 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
deleted file mode 100644
index 38c739d..0000000
--- a/data/autostart/cadence-session-start.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Service
-Icon=cadence
-Exec=cadence-session-start --system-start
-X-KDE-StartupNotify=false
-OnlyShowIn=KDE;
-Name=Cadence session startup
-Hidden=false