--- kdelibs-4.0.1/kinit/autostart.cpp.sav	2007-10-30 11:13:33.000000000 +0100
+++ kdelibs-4.0.1/kinit/autostart.cpp	2008-02-04 14:08:27.000000000 +0100
@@ -38,7 +38,9 @@ AutoStart::AutoStart()
   : m_phase(-1), m_phasedone(false)
 {
   m_startList = new AutoStartList;
-  KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
+  KGlobal::dirs()->addResourceType("xdgconf-autostart", NULL, "autostart/"); // xdg ones
+  KGlobal::dirs()->addResourceType("autostart", "xdgconf-autostart", "/"); // merge them
+  KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart"); // KDE ones are higher priority
 }
 
 AutoStart::~AutoStart()
--- kdelibs-4.0.1/kdecore/kernel/kautostart.cpp.sav	2007-11-13 11:43:41.000000000 +0100
+++ kdelibs-4.0.1/kdecore/kernel/kautostart.cpp	2008-02-04 14:08:14.000000000 +0100
@@ -51,7 +51,9 @@ KAutostart::KAutostart(const QString& en
     : QObject(parent),
       d(new Private)
 {
-    KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
+    KGlobal::dirs()->addResourceType("xdgconf-autostart", NULL, "autostart/"); // xdg ones
+    KGlobal::dirs()->addResourceType("autostart", "xdgconf-autostart", "/"); // merge them
+    KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart"); // KDE ones are higher priority
     if (entryName.isEmpty())
     {
         // XXX sure that the mainComponent is available at this point?