diff --git a/dist/.xsession b/dist/.xsession
index 33927bc..f42fe62 100755
--- a/dist/.xsession
+++ b/dist/.xsession
@@ -8,4 +8,6 @@ xset s noblank     # don't blank the video device
 
 unclutter -idle 5 -root & # hide cursor afer 5 seconds of inactivity
 
+~/on-pi-startup.sh &
+
 exec matchbox-window-manager -use_titlebar no
diff --git a/dist/on-pi-startup.sh b/dist/on-pi-startup.sh
new file mode 100755
index 0000000..463049c
--- /dev/null
+++ b/dist/on-pi-startup.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# http://peter.sh/experiments/chromium-command-line-switches/
+chromium-browser --start-fullscreen "https://github.com/futurice/chilipie-kiosk"