diff --git a/conf.d/kmscon.sh b/conf.d/kmscon.sh
new file mode 100644
index 0000000..941dd77
--- /dev/null
+++ b/conf.d/kmscon.sh
@@ -0,0 +1,3 @@
+# KMSCON config
+
+service_args+=' --hwaccel --drm --font-name terminus --palette solarized' # The space at the start is important.
diff --git a/init.d/X b/init.d/X
new file mode 100755
index 0000000..1d360b7
--- /dev/null
+++ b/init.d/X
@@ -0,0 +1,13 @@
+#!/usr/bin/env watchman
+
+service_username='fbt'
+export HOME="/home/${service_username}"
+service_workdir="$HOME"
+service_command='/bin/ssh-agent'
+service_args='/bin/xinit'
+
+
+start() {
+	cd "$service_workdir"
+	su "$service_username" -c "$BASH -l -c '${service_command} ${service_args}'" &>/tmp/xinit.log &
+}
diff --git a/init.d/kmscon b/init.d/kmscon
index 24ba78e..6dcda75 100755
--- a/init.d/kmscon
+++ b/init.d/kmscon
@@ -4,4 +4,4 @@ tty=${service_name##*-};
 
 service_respawn='true'
 service_command='/usr/bin/kmscon'
-service_args="--vt ${tty} --hwaccel --drm --font-name terminus --palette solarized"
+service_args="--vt ${tty}"