diff --git a/data/Makefile.am b/data/Makefile.am
index 6858a4aa0..1f866dc2c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -54,7 +54,9 @@ keys_in_files =					\
 	$(NULL)
 keys_DATA = $(keys_in_files:.xml.in=.xml)
 
-gsettings_SCHEMAS = org.gnome.shell.gschema.xml
+gsettings_SCHEMAS =				\
+	org.gnome.shell.gschema.xml		\
+	org.gnome.shell-foo.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -81,7 +83,8 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
 	$(keys_in_files)				\
-	org.gnome.shell.gschema.xml.in.in
+	org.gnome.shell.gschema.xml.in.in		\
+	org.gnome.shell-foo.gschema.xml.in.in
 
 CLEANFILES =						\
 	gnome-shell.desktop.in				\
@@ -91,4 +94,6 @@ CLEANFILES =						\
 	$(gsettings_SCHEMAS)				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in
+	org.gnome.shell.gschema.xml.in			\
+	org.gnome.shell-foo.gschema.valid		\
+	org.gnome.shell-foo.gschema.xml.in
diff --git a/data/org.gnome.shell-foo.gschema.xml.in.in b/data/org.gnome.shell-foo.gschema.xml.in.in
new file mode 100644
index 000000000..82e64e542
--- /dev/null
+++ b/data/org.gnome.shell-foo.gschema.xml.in.in
@@ -0,0 +1,13 @@
+<schemalist>
+  <schema id="org.gnome.shell-foo.overrides" path="/org/gnome/shell-foo/overrides/"
+	  gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="button-layout" type="s">
+      <default>":minimize,close"</default>
+      <_summary>Arrangement of buttons on the titlebar</_summary>
+      <_description>
+        This key overrides the key in org.gnome.desktop.wm.preferences when
+        running GNOME Shell in Foo mode.
+      </_description>
+    </key>
+  </schema>
+</schemalist>