diff --git a/desktop/misc/shared-mime-info/pspec.xml b/desktop/misc/shared-mime-info/pspec.xml
index cbe581aceb..771ded19e0 100644
--- a/desktop/misc/shared-mime-info/pspec.xml
+++ b/desktop/misc/shared-mime-info/pspec.xml
@@ -31,7 +31,7 @@
             <Dependency>glib2</Dependency>         
         </RuntimeDependencies>
         <Files>
-            <Path fileType="data">/etc/X11/Xsession.d</Path>
+            <Path fileType="data">/etc/X11/xinit</Path>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="data">/usr/share/applications</Path>
             <Path fileType="data">/usr/share/mime</Path>
@@ -41,7 +41,7 @@
             <Path fileType="man">/usr/share/man</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/30-update-mime-database.sh">update-mime-database.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/30-update-mime-database.sh">update-mime-database.sh</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/defaults.list">defaults.list</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/mimeapps.list">mimeapps.list</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/file-roller-defaults.list">file-roller-defaults.list</AdditionalFile>
diff --git a/x11/misc/xinit/files/Xsession.d/Xresources.sh b/x11/misc/xinit/files/xinitrc.d/Xresources.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/Xresources.sh
rename to x11/misc/xinit/files/xinitrc.d/Xresources.sh
diff --git a/x11/misc/xinit/files/Xsession.d/consolekit.sh b/x11/misc/xinit/files/xinitrc.d/consolekit.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/consolekit.sh
rename to x11/misc/xinit/files/xinitrc.d/consolekit.sh
diff --git a/x11/misc/xinit/files/Xsession.d/dbus.sh b/x11/misc/xinit/files/xinitrc.d/dbus.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/dbus.sh
rename to x11/misc/xinit/files/xinitrc.d/dbus.sh
diff --git a/x11/misc/xinit/files/Xsession.d/environment.sh b/x11/misc/xinit/files/xinitrc.d/environment.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/environment.sh
rename to x11/misc/xinit/files/xinitrc.d/environment.sh
diff --git a/x11/misc/xinit/files/Xsession.d/localuser.sh b/x11/misc/xinit/files/xinitrc.d/localuser.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/localuser.sh
rename to x11/misc/xinit/files/xinitrc.d/localuser.sh
diff --git a/x11/misc/xinit/files/Xsession.d/ssh-agent.sh b/x11/misc/xinit/files/xinitrc.d/ssh-agent.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/ssh-agent.sh
rename to x11/misc/xinit/files/xinitrc.d/ssh-agent.sh
diff --git a/x11/misc/xinit/files/Xsession.d/startup.sh b/x11/misc/xinit/files/xinitrc.d/startup.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/startup.sh
rename to x11/misc/xinit/files/xinitrc.d/startup.sh
diff --git a/x11/misc/xinit/files/Xsession.d/xdg-runtime-dir.sh b/x11/misc/xinit/files/xinitrc.d/xdg-runtime-dir.sh
similarity index 79%
rename from x11/misc/xinit/files/Xsession.d/xdg-runtime-dir.sh
rename to x11/misc/xinit/files/xinitrc.d/xdg-runtime-dir.sh
index 40246c054a..353933e009 100644
--- a/x11/misc/xinit/files/Xsession.d/xdg-runtime-dir.sh
+++ b/x11/misc/xinit/files/xinitrc.d/xdg-runtime-dir.sh
@@ -7,5 +7,5 @@ if test -z "${XDG_RUNTIME_DIR}"; then
     fi
 fi
 mkdir -p ~/.config
-cp weston/weston.ini ~/.config
-$EDITOR ~/.config/weston.ini
+#cp weston/weston.ini ~/.config
+#$EDITOR ~/.config/weston.ini
diff --git a/x11/misc/xinit/files/Xsession.d/xkb.sh b/x11/misc/xinit/files/xinitrc.d/xkb.sh
similarity index 100%
rename from x11/misc/xinit/files/Xsession.d/xkb.sh
rename to x11/misc/xinit/files/xinitrc.d/xkb.sh
diff --git a/x11/misc/xinit/pspec.xml b/x11/misc/xinit/pspec.xml
index 40dbf6c2a8..c8e070d1d0 100644
--- a/x11/misc/xinit/pspec.xml
+++ b/x11/misc/xinit/pspec.xml
@@ -30,12 +30,10 @@
         <RuntimeDependencies>
             <Dependency>libX11</Dependency>
             <Dependency>xorg-app</Dependency>
-            <Dependency>ConsoleKit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/X11/Xresources</Path>
             <Path fileType="config">/etc/X11/xinit</Path>
-            <Path fileType="data">/etc/X11/Xsession.d</Path>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/usr/lib/X11/xinit</Path>
             <Path fileType="doc">/usr/share/doc</Path>
@@ -47,15 +45,14 @@
             <AdditionalFile owner="root" permission="0644" target="/etc/X11/xinit/xserverrc">xserverrc</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xserverrc">xserverrc</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xresources" >Xresources</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-localuser.sh">Xsession.d/localuser.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-xdg-runtime-dir.sh">Xsession.d/xdg-runtime-dir.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-Xresources.sh">Xsession.d/Xresources.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-xkb.sh">Xsession.d/xkb.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/20-startup.sh">Xsession.d/startup.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/25-environment.sh">Xsession.d/environment.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/50-dbus.sh">Xsession.d/dbus.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/90-ssh-agent.sh">Xsession.d/ssh-agent.sh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/90-consolekit.sh">Xsession.d/consolekit.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-localuser.sh">xinitrc.d/localuser.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-xdg-runtime-dir.sh">xinitrc.d/xdg-runtime-dir.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-Xresources.sh">xinitrc.d/Xresources.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-xkb.sh">xinitrc.d/xkb.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/20-startup.sh">xinitrc.d/startup.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/25-environment.sh">xinitrc.d/environment.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/50-dbus.sh">xinitrc.d/dbus.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/90-ssh-agent.sh">xinitrc.d/ssh-agent.sh</AdditionalFile>
         </AdditionalFiles>
     </Package>