diff --git a/e16.spec.in b/e16.spec.in
index 3bfd7724..8c1e0e27 100644
--- a/e16.spec.in
+++ b/e16.spec.in
@@ -48,6 +48,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
 rm -f $RPM_BUILD_ROOT/usr/lib/libe16_*.a
 rm -f $RPM_BUILD_ROOT/usr/lib/libe16_*.la
+mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/Xclients.d
+cp $RPM_BUILD_ROOT/usr/share/e16/misc/Xclients.* $RPM_BUILD_ROOT/etc/X11/xinit/Xclients.d/
 
 %clean
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -60,6 +62,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 %{_datadir}/locale/*
 %{_datadir}/xsessions/*
+%{_sysconfdir}/X11/xinit/Xclients.d/*
 #%{_mandir}/*
 
 %changelog
diff --git a/misc/E-GNOME b/misc/E-GNOME
deleted file mode 100644
index 6b927924..00000000
--- a/misc/E-GNOME
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/X11/xdm/Xsession e-gnome
diff --git a/misc/E-KDE b/misc/E-KDE
deleted file mode 100644
index 44188628..00000000
--- a/misc/E-KDE
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/X11/xdm/Xsession e-kde
diff --git a/misc/E16 b/misc/E16
deleted file mode 100644
index 90522eee..00000000
--- a/misc/E16
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/X11/xdm/Xsession e16
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 153d9880..f3a0a95d 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,15 +1,20 @@
 DESKTOPS = e16.desktop e16-gnome.desktop e16-kde.desktop
 DESKTOPS_IN = e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
-XCLIENTS = Xclients.e16 Xclients.e-gnome Xclients.e-kde
-SESSIONS = E16 E-GNOME E-KDE
+XCLIENTS = Xclients.e16.sh Xclients.e16-gnome.sh Xclients.e16-kde.sh
 STARTUP = starte16
 ICONS = e16.png
 
-misc_DATA = $(DESKTOPS) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
-sesm_DATA = e16.desktop
 bin_SCRIPTS = starte16
 
-EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
-
 miscdir = $(ENLIGHTENMENT_ROOT)/misc
-sesmdir = $(datadir)/xsessions
+misc_DATA = $(ICONS) $(DESKTOPS)
+misc_SCRIPTS = $(XCLIENTS)
+
+xsessiondir = $(datadir)/xsessions
+xsession_DATA = $(DESKTOPS)
+
+# Is this Fedora only stuff?
+#xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
+#xclients_SCRIPTS = $(XCLIENTS)
+
+EXTRA_DIST = $(DESKTOPS_IN) $(SCRIPTS) $(ICONS)
diff --git a/misc/Xclients.e-gnome b/misc/Xclients.e-gnome
deleted file mode 100644
index 097fa39b..00000000
--- a/misc/Xclients.e-gnome
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec starte16 GNOME
diff --git a/misc/Xclients.e-kde b/misc/Xclients.e-kde
deleted file mode 100644
index 9737136d..00000000
--- a/misc/Xclients.e-kde
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec starte16 KDE
diff --git a/misc/Xclients.e16-gnome.sh b/misc/Xclients.e16-gnome.sh
new file mode 100755
index 00000000..11d66ef2
--- /dev/null
+++ b/misc/Xclients.e16-gnome.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec starte16 gnome
diff --git a/misc/Xclients.e16-kde.sh b/misc/Xclients.e16-kde.sh
new file mode 100755
index 00000000..340dbe99
--- /dev/null
+++ b/misc/Xclients.e16-kde.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec starte16 kde
diff --git a/misc/Xclients.e16 b/misc/Xclients.e16.sh
old mode 100644
new mode 100755
similarity index 100%
rename from misc/Xclients.e16
rename to misc/Xclients.e16.sh
diff --git a/misc/e16-gnome.desktop.in b/misc/e16-gnome.desktop.in
index 8b82dfd3..54dc007f 100644
--- a/misc/e16-gnome.desktop.in
+++ b/misc/e16-gnome.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=XSession
 Name=E-GNOME
 Comment=This session starts GNOME using enlightenment (e16) as window manager
-Exec=starte16 GNOME
+Exec=e16-gnome
 Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
-Type=Application
diff --git a/misc/e16-kde.desktop.in b/misc/e16-kde.desktop.in
index 89dd47f0..f53b4047 100644
--- a/misc/e16-kde.desktop.in
+++ b/misc/e16-kde.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=XSession
 Name=E-KDE
 Comment=This session starts KDE using enlightenment (e16) as window manager
-Exec=starte16 KDE
+Exec=e16-kde
 Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
-Type=Application
diff --git a/misc/e16.desktop.in b/misc/e16.desktop.in
index 80b6deb0..d576d68a 100644
--- a/misc/e16.desktop.in
+++ b/misc/e16.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=XSession
 Name=E16
 Comment=This session starts the Enlightenment (e16) window manager
-Exec=starte16
+Exec=e16
 Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
-Type=Application
diff --git a/misc/starte16 b/misc/starte16
index 9b4ecf45..9bc06bc1 100644
--- a/misc/starte16
+++ b/misc/starte16
@@ -1,10 +1,10 @@
 #!/bin/sh
 case "$1" in
-GNOME)
+gnome|GNOME)
 	export WINDOW_MANAGER=e16
 	exec gnome-session
 	;;
-KDE)
+kde|KDE)
 	export KDEWM=e16
 	exec startkde
 	;;