diff --git a/meta-digi-arm/recipes-bsp/formfactor/formfactor/machconfig b/meta-digi-arm/recipes-bsp/formfactor/formfactor/machconfig
index 4a0aeeaf9..12a9134ab 100644
--- a/meta-digi-arm/recipes-bsp/formfactor/formfactor/machconfig
+++ b/meta-digi-arm/recipes-bsp/formfactor/formfactor/machconfig
@@ -1,3 +1,4 @@
 # Display options
 HAVE_TOUCHSCREEN=1
 HAVE_KEYBOARD=0
+SHOWCURSOR="yes"
diff --git a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session
new file mode 100644
index 000000000..9b7c7a927
--- /dev/null
+++ b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+## Use SHOWCURSOR from formfactor config files instaed of hardcoding it
+# if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
+#     SHOWCURSOR="no"
+# else
+#     SHOWCURSOR="yes"
+# fi
+
+if [ "$HAVE_KEYBOARD" = "1" ]; then
+    KEYBOARD_APPLET=""
+else
+    KEYBOARD_APPLET="keyboard"
+fi
+
+
+matchbox-desktop &
+
+# Lines containing feature-[foo] are removed at build time if the machine
+# doesn't have the feature "foo".
+
+START_APPLETS=showdesktop,windowselector
+END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify
+END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
+
+matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
+
+exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
diff --git a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend
new file mode 100644
index 000000000..69fd49209
--- /dev/null
+++ b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend
@@ -0,0 +1,3 @@
+# Copyright (C) 2014 Digi International.
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"