diff --git a/configure.ac b/configure.ac
index 65369173..57144368 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ activities/Makefile
 activities/browser/Makefile
 activities/chat/Makefile
 shell/Makefile
+shell/data/Makefile
 sugar/Makefile
 sugar/__installed__.py
 sugar/activity/Makefile
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 99cc0759..ecf7329a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = data
+
 bin_SCRIPTS = sugar sugar-activity
 
 sugardir = $(pkgdatadir)/shell
diff --git a/shell/data/Makefile.am b/shell/data/Makefile.am
new file mode 100644
index 00000000..34a0a9b4
--- /dev/null
+++ b/shell/data/Makefile.am
@@ -0,0 +1,4 @@
+confdir = $(sysconfdir)/matchbox
+conf_DATA = kbdconfig
+
+EXTRA_DIST = kbdconfig
diff --git a/shell/data/kbdconfig b/shell/data/kbdconfig
new file mode 100644
index 00000000..3e8d1709
--- /dev/null
+++ b/shell/data/kbdconfig
@@ -0,0 +1,9 @@
+# This is the sugar keyboard configuration for matchbox
+
+### Window operation short cuts 
+
+<Alt>n=next
+<Alt>p=prev
+<Alt>c=close
+f1=desktop
+f2=!sugar-people