diff --git a/share/skel/Makefile b/share/skel/Makefile
index 4600686115d..4f79c209df6 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -2,7 +2,7 @@
 
 FILESGROUPS=	FILES1 FILES2
 FILES1=		dot.cshrc dot.login dot.login_conf dot.mailrc dot.mkshrc dot.profile \
-		dot.shrc
+		dot.shrc dot.xinitrc
 FILES2=		dot.mail_aliases dot.rhosts 
 FILES1DIR=	${SHAREDIR}/skel
 FILES2DIR=	${SHAREDIR}/skel
diff --git a/share/skel/dot.xinitrc b/share/skel/dot.xinitrc
new file mode 100644
index 00000000000..2f0db193872
--- /dev/null
+++ b/share/skel/dot.xinitrc
@@ -0,0 +1,22 @@
+#!/bin/sh
+# ~/.xinitrc
+# Executed by startx (run your window manager from here)
+
+DEFAULT_SESSION="wmaker"
+
+if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
+  for f in /usr/local/etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+
+case $1 in
+wmaker|startxfce4|twm|etoile)
+	exec $1
+	;;
+*)
+	exec $DEFAULT_SESSION
+	;;
+esac