diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
index 2cb0545..d8573b5 100644
--- a/gnobots2/Makefile.am
+++ b/gnobots2/Makefile.am
@@ -6,13 +6,10 @@ endif
 
 NULL =
 
-schema_in_files = gnobots2.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
-
-@INTLTOOL_SCHEMAS_RULE@
+gsettings_in_file = org.gnome.gnobots2.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 man_MANS = gnobots2.6
 
@@ -124,13 +121,10 @@ EXTRA_DIST = AUTHORS \
              $(theme_DATA) \
              $(Games_DATA) \
              $(config_DATA) \
-             $(schema_in_files) \
+             $(gsettings_in_file) \
              $(man_MANS)
 
 install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)
-endif
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-for cfn in $(config_DATA); do \
 	    cfn2=`echo $$cfn | sed -e 's/\.cfg//'`; \
@@ -147,6 +141,6 @@ install-exec-hook:
 	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ;\
 	fi
 
-DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
+DISTCLEANFILES = $(Games_DATA) $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnobots2/gnobots.c b/gnobots2/gnobots.c
index a300b11..ba3bdfc 100644
--- a/gnobots2/gnobots.c
+++ b/gnobots2/gnobots.c
@@ -28,11 +28,11 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 
-#include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
 #include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
+#include <libgames-support/games-settings.h>
 #include <libgames-support/games-stock.h>
 
 #ifdef WITH_SMCLIENT
@@ -64,6 +64,7 @@
 GtkWidget *app = NULL;
 GtkWidget *game_area = NULL;
 GamesScores *highscores;
+GSettings *settings;
 /**********************************************************************/
 
 
@@ -242,7 +243,7 @@ main (int argc, char *argv[])
                                  0 /* default category */,
                                  GAMES_SCORES_STYLE_PLAIN_DESCENDING);
 
-  games_conf_initialise ("Gnobots2");
+  settings = g_settings_new ("org.gnome.gnobots2");
 
   gtk_window_set_default_icon_name ("gnome-robots");
 
@@ -258,7 +259,7 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (app), _("Robots"));
 
   gtk_window_set_default_size (GTK_WINDOW (app), DEFAULT_WIDTH, DEFAULT_HEIGHT);
-  games_conf_add_window (GTK_WINDOW (app), KEY_GEOMETRY_GROUP);
+  games_settings_bind_window_state ("/org/gnome/gnobots2/", GTK_WINDOW (app));
 
   g_signal_connect (G_OBJECT (app), "delete_event",
 		    G_CALLBACK (quit_game), NULL);
@@ -367,7 +368,7 @@ main (int argc, char *argv[])
 
   gtk_main ();
 
-  games_conf_shutdown ();
+  g_settings_sync();
 
   games_runtime_shutdown ();
 
diff --git a/gnobots2/gnobots.h b/gnobots2/gnobots.h
index 7e4fff4..d9da9a0 100644
--- a/gnobots2/gnobots.h
+++ b/gnobots2/gnobots.h
@@ -8,6 +8,7 @@
 extern GtkWidget *app;
 extern GtkWidget *game_area;
 extern GamesScores *highscores;
+extern GSettings *settings;
 /**********************************************************************/
 
 
diff --git a/gnobots2/gnobots2.schemas.in b/gnobots2/gnobots2.schemas.in
deleted file mode 100644
index 63546de..0000000
--- a/gnobots2/gnobots2.schemas.in
+++ /dev/null
@@ -1,236 +0,0 @@
-<gconfschemafile>
-
-  <schemalist>
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/show_toolbar</key>
-      <applyto>/apps/gnobots2/preferences/show_toolbar</applyto>
-      <owner>gnobots2</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show toolbar</short>
-        <long>Show toolbar. A standard option for toolbars.</long>
-      </locale>
-      </schema>
-
-
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/theme</key>
-      <applyto>/apps/gnobots2/preferences/theme</applyto>
-      <owner>gnobots2</owner>
-      <type>string</type>
-      <default>robots</default>
-      <locale name="C">
-        <short>Robot image theme</short>
-        <long>Robot image theme.  The theme of the images to use for the robots.</long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/background_color</key>
-      <applyto>/apps/gnobots2/preferences/background_color</applyto>
-      <owner>gnobots2</owner>
-      <type>string</type>
-      <default>#7590AE</default>
-      <locale name="C">
-        <short>Background color</short>
-        <long>Background color.  The hex specification of the background color.</long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/configuration</key>
-      <applyto>/apps/gnobots2/preferences/configuration</applyto>
-      <owner>gnobots2</owner>
-      <type>string</type>
-      <default>classic_robots</default>
-      <locale name="C">
-        <short>Game type</short>
-        <long>Game type.  The name of the game variation to use.</long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/use_safe_moves</key>
-      <applyto>/apps/gnobots2/preferences/use_safe_moves</applyto>
-      <owner>gnobots2</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Use safe moves</short>
-        <long>Use safe moves.  The safe moves option will help you to avoid being killed due to a mistake. If you try to make a move that would lead to your death when there is a safe move available you will not be allowed to proceed.</long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/use_super_safe_moves</key>
-      <applyto>/apps/gnobots2/preferences/use_super_safe_moves</applyto>
-      <owner>gnobots2</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Use super safe moves</short>
-        <long>Use super safe moves.  The player is alerted when there is no safe move and the only option is to teleport out.</long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/gnobots2/preferences/enable_sound</key>
-      <applyto>/apps/gnobots2/preferences/enable_sound</applyto>
-      <owner>gnobots2</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Enable game sounds</short>
-        <long>Enable game sounds.   Play sounds for various events throughout the game.</long>
-      </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key00</key>
-        <applyto>/apps/gnobots2/preferences/key00</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Home</default>
-        <locale name="C">
-          <short>Key to move NW</short>
-          <long>The name of the key used to move north-west. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key01</key>
-        <applyto>/apps/gnobots2/preferences/key01</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Up</default>
-        <locale name="C">
-          <short>Key to move N</short>
-          <long>The name of the key used to move north. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key02</key>
-        <applyto>/apps/gnobots2/preferences/key02</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Page_Up</default>
-        <locale name="C">
-          <short>Key to move NE</short>
-          <long>The name of the key used to move north-east. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key03</key>
-        <applyto>/apps/gnobots2/preferences/key03</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Left</default>
-        <locale name="C">
-          <short>Key to move W</short>
-          <long>The name of the key used to move west. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key04</key>
-        <applyto>/apps/gnobots2/preferences/key04</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Begin</default>
-        <locale name="C">
-          <short>Key to hold</short>
-          <long>The name of the key used to hold still. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key05</key>
-        <applyto>/apps/gnobots2/preferences/key05</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Right</default>
-        <locale name="C">
-          <short>Key to move E</short>
-          <long>The name of the key used to move east. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key06</key>
-        <applyto>/apps/gnobots2/preferences/key06</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_End</default>
-        <locale name="C">
-          <short>Key to move SW</short>
-          <long>The name of the key used to move south-west. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key07</key>
-        <applyto>/apps/gnobots2/preferences/key07</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Down</default>
-        <locale name="C">
-          <short>Key to move S</short>
-          <long>The name of the key used to move south. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key08</key>
-        <applyto>/apps/gnobots2/preferences/key08</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Page_Down</default>
-        <locale name="C">
-          <short>Key to move SE</short>
-          <long>The name of the key used to move south-east. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key09</key>
-        <applyto>/apps/gnobots2/preferences/key09</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Add</default>
-        <locale name="C">
-          <short>Key to teleport</short>
-          <long>The name of the key used to teleport safely (if possible). The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key10</key>
-        <applyto>/apps/gnobots2/preferences/key10</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Multiply</default>
-        <locale name="C">
-          <short>Key to teleport randomly</short>
-          <long>The name of the key used to teleport randomly. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gnobots2/preferences/key11</key>
-        <applyto>/apps/gnobots2/preferences/key11</applyto>
-        <owner>gnobots2</owner>
-        <type>string</type>
-        <default>KP_Enter</default>
-        <locale name="C">
-          <short>Key to wait</short>
-          <long>The name of the key used to wait. The name is a standard X key name.</long>
-        </locale>
-      </schema>
-
-  </schemalist>
-
-</gconfschemafile>
-
diff --git a/gnobots2/org.gnome.gnobots2.gschema.xml.in b/gnobots2/org.gnome.gnobots2.gschema.xml.in
new file mode 100644
index 0000000..9b310bb
--- /dev/null
+++ b/gnobots2/org.gnome.gnobots2.gschema.xml.in
@@ -0,0 +1,119 @@
+<schemalist>
+  <schema id="org.gnome.gnobots2" path="/org/gnome/gnobots2/" gettext-domain="gnome-games">
+ 
+    <key name="show-toolbar" type="b">
+      <default>true</default>
+      <_summary>Show toolbar</_summary>
+      <_description>Show toolbar. A standard option for toolbars.</_description>
+    </key>
+ 
+    <key name="theme" type="s">
+      <default>"robots"</default>
+      <_summary>Robot image theme</_summary>
+      <_description>Robot image theme.  The theme of the images to use for the robots.</_description>
+    </key>
+ 
+    <key name="background-color" type="s">
+      <default>"#7590AE"</default>
+      <_summary>Background color</_summary>
+      <_description>Background color.  The hex specification of the background color.</_description>
+    </key>
+ 
+    <key name="configuration" type="s">
+      <default>"classic_robots"</default>
+      <_summary>Game type</_summary>
+      <_description>Game type.  The name of the game variation to use.</_description>
+    </key>
+
+    <key name="use-safe-moves" type="b">
+      <default>true</default>
+      <_summary>Use safe moves</_summary>
+      <_description>Use safe moves.  The safe moves option will help you to avoid being killed due to a mistake. If you try to make a move that would lead to your death when there is a safe move available you will not be allowed to proceed.</_description>
+    </key>
+
+    <key name="use-super-safe-moves" type="b">
+      <default>true</default>
+      <_summary>Use super safe moves</_summary>
+      <_description>Use super safe moves.  The player is alerted when there is no safe move and the only option is to teleport out.</_description>
+    </key>
+
+    <key name="enable-sound" type="b">
+      <default>true</default>
+      <_summary>Enable game sounds</_summary>
+      <_description>Enable game sounds.   Play sounds for various events throughout the game.</_description>
+    </key>
+
+    <key name="key00" type="s">
+      <default>"KP_Home"</default>
+      <_summary>Key to move NW</_summary>
+      <_description>The name of the key used to move north-west. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key01" type="s">
+      <default>"KP_Up"</default>
+      <_summary>Key to move N</_summary>
+      <_description>The name of the key used to move north. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key02" type="s">
+      <default>"KP_Page_Up"</default>
+      <_summary>Key to move NE</_summary>
+      <_description>The name of the key used to move north-east. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key03" type="s">
+      <default>"KP_Left"</default>
+      <_summary>Key to move W</_summary>
+      <_description>The name of the key used to move west. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key04" type="s">
+      <default>"KP_Begin"</default>
+      <_summary>Key to hold</_summary>
+      <_description>The name of the key used to hold still. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key05" type="s">
+      <default>"KP_Right"</default>
+      <_summary>Key to move E</_summary>
+      <_description>The name of the key used to move east. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key06" type="s">
+      <default>"KP_End"</default>
+      <_summary>Key to move SW</_summary>
+      <_description>The name of the key used to move south-west. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key07" type="s">
+      <default>"KP_Down"</default>
+      <_summary>Key to move S</_summary>
+      <_description>The name of the key used to move south. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key08" type="s">
+      <default>"KP_Page_Down"</default>
+      <_summary>Key to move SE</_summary>
+      <_description>The name of the key used to move south-east. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key09" type="s">
+      <default>"KP_Add"</default>
+      <_summary>Key to teleport</_summary>
+      <_description>The name of the key used to teleport safely (if possible). The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key10" type="s">
+      <default>"KP_Multiply"</default>
+      <_summary>Key to teleport randomly</_summary>
+      <_description>The name of the key used to teleport randomly. The name is a standard X key name.</_description>
+    </key>
+
+    <key name="key11" type="s">
+      <default>"KP_Enter"</default>
+      <_summary>Key to wait</_summary>
+      <_description>The name of the key used to wait. The name is a standard X key name.</_description>
+    </key>
+
+  </schema>
+</schemalist>
diff --git a/gnobots2/properties.c b/gnobots2/properties.c
index f1271f8..8bff199 100644
--- a/gnobots2/properties.c
+++ b/gnobots2/properties.c
@@ -32,7 +32,7 @@
 #include <libgames-support/games-files.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
-#include <libgames-support/games-conf.h>
+#include <libgames-support/games-settings.h>
 #include <libgames-support/games-sound.h>
 #include <libgames-support/games-runtime.h>
 
@@ -54,12 +54,12 @@
 #define KB_TEXT_HEIGHT   32
 
 #define KEY_PREFERENCES_GROUP "preferences"
-#define KEY_BACKGROUND_COLOR  "background_color"
+#define KEY_BACKGROUND_COLOR  "background-color"
 #define KEY_CONFIGURATION     "configuration"
-#define KEY_ENABLE_SOUND      "enable_sound"
-#define KEY_SAFE_MOVES        "use_safe_moves"
-#define KEY_SHOW_TOOLBAR      "show_toolbar"
-#define KEY_SUPER_SAFE_MOVES  "use_super_safe_moves"
+#define KEY_ENABLE_SOUND      "enable-sound"
+#define KEY_SAFE_MOVES        "use-safe-moves"
+#define KEY_SHOW_TOOLBAR      "show-toolbar"
+#define KEY_SUPER_SAFE_MOVES  "use-super-safe-moves"
 #define KEY_THEME             "theme"
 #define KEY_CONTROL_KEY       "key%02d"
 
@@ -602,16 +602,13 @@ load_properties (void)
 
   load_keys ();
 
-  bgcolour = games_conf_get_string_with_default (KEY_PREFERENCES_GROUP,
-                                                 KEY_BACKGROUND_COLOR, "#7590AE");
+  bgcolour = g_settings_get_string (settings, KEY_BACKGROUND_COLOR);
   gdk_color_parse (bgcolour, &properties.bgcolour);
   set_background_color (properties.bgcolour);
 
-  properties.themename = games_conf_get_string_with_default (KEY_PREFERENCES_GROUP,
-                                                             KEY_THEME, "robots");
+  properties.themename = g_settings_get_string (settings, KEY_THEME);
 
-  cname = games_conf_get_string_with_default (KEY_PREFERENCES_GROUP,
-                                              KEY_CONFIGURATION, "classic_robots");
+  cname = g_settings_get_string (settings, KEY_CONFIGURATION);
 
   properties.selected_config = 0;
   for (i = 0; i < num_game_configs (); ++i) {
@@ -625,15 +622,14 @@ load_properties (void)
   }
   g_free (cname);
 
-  properties.safe_moves = games_conf_get_boolean (KEY_PREFERENCES_GROUP,
-						  KEY_SAFE_MOVES, NULL);
-  properties.super_safe_moves = games_conf_get_boolean (KEY_PREFERENCES_GROUP,
-						        KEY_SUPER_SAFE_MOVES,
-						        NULL);
-  properties.sound = games_conf_get_boolean (KEY_PREFERENCES_GROUP,
-                                             KEY_ENABLE_SOUND, NULL);
-  properties.show_toolbar = games_conf_get_boolean (KEY_PREFERENCES_GROUP,
-                                                    KEY_SHOW_TOOLBAR, NULL);
+  properties.safe_moves = g_settings_get_boolean (settings,
+						  KEY_SAFE_MOVES);
+  properties.super_safe_moves = g_settings_get_boolean (settings,
+						        KEY_SUPER_SAFE_MOVES);
+  properties.sound = g_settings_get_boolean (settings,
+                                             KEY_ENABLE_SOUND);
+  properties.show_toolbar = g_settings_get_boolean (settings,
+                                                    KEY_SHOW_TOOLBAR);
 
   games_sound_enable (properties.sound);
   set_game_graphics (properties.themename);
@@ -646,22 +642,20 @@ void
 load_keys (void)
 {
   gchar buffer[256];
+  gchar *keyval_name;
   gint i;
 
   for (i = 0; i < 12; i++) {
-    properties.keys[i] = default_keys[i];
-
     g_snprintf (buffer, sizeof (buffer), KEY_CONTROL_KEY, i);
-
-    properties.keys[i] = games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
-                                                             buffer, default_keys[i]);
+    keyval_name = g_settings_get_string (settings, buffer);
+    properties.keys[i] = gdk_keyval_from_name (keyval_name);
   }
 }
 
 void
 conf_set_theme (gchar * value)
 {
-  games_conf_set_string (KEY_PREFERENCES_GROUP, KEY_THEME, value);
+  g_settings_set_string (settings, KEY_THEME, value);
 }
 
 static void
@@ -671,45 +665,48 @@ conf_set_background_color (GdkColor * c)
 
   g_snprintf (colour, sizeof (colour), "#%04x%04x%04x", c->red, c->green, c->blue);
 
-  games_conf_set_string (KEY_PREFERENCES_GROUP, KEY_BACKGROUND_COLOR, colour);
+  g_settings_set_string (settings, KEY_BACKGROUND_COLOR, colour);
 }
 
 void
 conf_set_configuration (gchar * value)
 {
-  games_conf_set_string (KEY_PREFERENCES_GROUP, KEY_CONFIGURATION, value);
+  g_settings_set_string (settings, KEY_CONFIGURATION, value);
 }
 
 void
 conf_set_use_safe_moves (gboolean value)
 {
-  games_conf_set_boolean (KEY_PREFERENCES_GROUP, KEY_SAFE_MOVES, value);
+  g_settings_set_boolean (settings, KEY_SAFE_MOVES, value);
 }
 
 void
 conf_set_use_super_safe_moves (gboolean value)
 {
-  games_conf_set_boolean (KEY_PREFERENCES_GROUP, KEY_SUPER_SAFE_MOVES, value);
+  g_settings_set_boolean (settings, KEY_SUPER_SAFE_MOVES, value);
 }
 
 void
 conf_set_enable_sound (gboolean value)
 {
-  games_conf_set_boolean (KEY_PREFERENCES_GROUP, KEY_ENABLE_SOUND, value);
+  g_settings_set_boolean (settings, KEY_ENABLE_SOUND, value);
 }
 
 void
 conf_set_show_toolbar (gboolean value)
 {
-  games_conf_set_boolean (KEY_PREFERENCES_GROUP, KEY_SHOW_TOOLBAR, value);
+  g_settings_set_boolean (settings, KEY_SHOW_TOOLBAR, value);
 }
 
 void
 conf_set_control_key (gint i, guint keyval)
 {
   char buffer[64];
+  gchar *keyval_name;
+
   g_snprintf (buffer, sizeof (buffer), KEY_CONTROL_KEY, i);
-  games_conf_set_keyval (KEY_PREFERENCES_GROUP, buffer, keyval);
+  keyval_name = gdk_keyval_name (keyval);
+  g_settings_set_string (settings, buffer, keyval_name);
 }
 
 /**
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 505dfbd..641f2f4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,7 +42,7 @@ gnibbles/scoreboard.c
 gnobots2/game.c
 gnobots2/gnobots.c
 gnobots2/gnobots2.desktop.in.in
-gnobots2/gnobots2.schemas.in
+gnobots2/org.gnome.gnobots2.gschema.xml.in
 gnobots2/graphics.c
 gnobots2/menu.c
 gnobots2/properties.c
