diff --git a/Makefile.am b/Makefile.am
index c354d16..78c9c6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -257,6 +257,9 @@ gsettings_SCHEMAS = common/org.gnome.Vino.gschema.xml
 
 @GSETTINGS_RULES@
 
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = common/org.gnome.Vino.convert
+
 if MAINTAINER_MODE
 dist-hook: dist-changelog
 else
diff --git a/common/org.gnome.Vino.convert b/common/org.gnome.Vino.convert
new file mode 100644
index 0000000..84d2b16
--- /dev/null
+++ b/common/org.gnome.Vino.convert
@@ -0,0 +1,15 @@
+[org.gnome.Vino]
+prompt-enabled = /desktop/gnome/remote_access/prompt_enabled
+view-only = /desktop/gnome/remote_access/view_only
+network-interface = /desktop/gnome/remote_access/network_interface
+use-alternative-port = /desktop/gnome/remote_access/use_alternative_port
+alternative-port = /desktop/gnome/remote_access/alternative_port
+require-encryption = /desktop/gnome/remote_access/require_encryption
+authentication-methods = /desktop/gnome/remote_access/authentication_methods
+vnc-password = /desktop/gnome/remote_access/vnc_password
+mailto = /desktop/gnome/remote_access/mailto
+lock-screen-on-disconnect = /desktop/gnome/remote_access/lock_screen_on_disconnect
+icon-visibility = /desktop/gnome/remote_access/icon_visibility
+disable-background = /desktop/gnome/remote_access/disable_background
+use-upnp = /desktop/gnome/remote_access/use_upnp
+disable-xdamage = /desktop/gnome/remote_access/disable_xdamage