diff --git a/data/Makefile.am b/data/Makefile.am
index 287b99d70..04c8f4f6a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -59,6 +59,8 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
 
 all-local: gschemas.compiled
 
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = gnome-shell-overrides.convert
 
 shadersdir = $(pkgdatadir)/shaders
 shaders_DATA = \
@@ -69,6 +71,7 @@ EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
 	$(menu_DATA)					\
 	$(shaders_DATA)					\
+	$(convert_DATA)					\
 	org.gnome.shell.gschema.xml.in
 
 CLEANFILES =						\
diff --git a/data/gnome-shell-overrides.convert b/data/gnome-shell-overrides.convert
new file mode 100644
index 000000000..f397de91b
--- /dev/null
+++ b/data/gnome-shell-overrides.convert
@@ -0,0 +1,5 @@
+[org.gnome.shell.overrides]
+attach-modal-dialogs = /desktop/gnome/shell/windows/attach_modal_dialogs
+button-layout = /desktop/gnome/shell/windows/button_layout
+edge-tiling = /desktop/gnome/shell/windows/edge_tiling
+workspaces-only-on-primary = /desktop/gnome/shell/windows/workspaces_only_on_primary