diff --git a/mambabase/mambabase.sh b/mambabase/mambabase.sh
index 7b690e7..00679c8 100644
--- a/mambabase/mambabase.sh
+++ b/mambabase/mambabase.sh
@@ -92,14 +92,11 @@ if [ "$INSTALL_BASE" = "1" ]; then
    dcop_write $"Removing packages that are no longer needed..." 10
    rpm -q msysklogd >/dev/null && apt_get_parsed remove -y msysklogd
 
-   # first time: remove mamba from user autostart
-   [ -e /home/$USER/.kde/Autostart/mambabase.desktop ] && {
-      rm -f /home/$USER/.kde/Autostart/mambabase.desktop
-      [ -e /home/$USER/.kde/share/config/ktiprc ] && \
-         rm -f /home/$USER/.kde/share/config/ktiprc
-   }
+   # first time: remove mambabase from autostart
    [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
       rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
+   [ -e /etc/xdg/autostart/mambabase.desktop ] && \
+      rm -f /etc/xdg/autostart/mambabase.desktop
 
    dcop_write $"Installing/updating openmamba base packages..." 15
    rpm -q --whatprovides $BASE_PKGS >/dev/null || apt_get_parsed install -y $BASE_PKGS
diff --git a/mambawelcome/mambawelcome.sh b/mambawelcome/mambawelcome.sh
index 2698dee..0412973 100755
--- a/mambawelcome/mambawelcome.sh
+++ b/mambawelcome/mambawelcome.sh
@@ -115,9 +115,10 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    #mkdir /home/$INSTALL_USER/Desktop
    chmod 711 /home/$INSTALL_USER
    #cp /usr/share/openmamba/installer/*.txt /home/$INSTALL_USER/Desktop/
-   mkdir -p /home/$INSTALL_USER/.kde4/Autostart
-   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
-   chmod 711 /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
+
+   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /etc/xdg/autostart/mambabase.desktop
+   chown $INSTALL_USER /etc/xdg/autostart/mambabase.desktop
+   chmod 644 /etc/xdg/autostart/mambabase.desktop
 
    # create home kde configuration directory
    mkdir -p /home/$INSTALL_USER/.kde4/share/config