diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 8d20bbfe7..72bc7ca2d 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -783,10 +783,10 @@ is_valid_keyname (const gchar  *key,
       return FALSE;
     }
 
-  if (i > 32)
+  if (i > 1024)
     {
       g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                   _("invalid name '%s': maximum length is 32"), key);
+                   _("invalid name '%s': maximum length is 1024"), key);
       return FALSE;
     }
 
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 24dc5ca3e..251fe20c5 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -77,8 +77,7 @@
  * values as #GVariant, and allows any #GVariantType for keys. Key names
  * are restricted to lowercase characters, numbers and '-'. Furthermore,
  * the names must begin with a lowercase character, must not end
- * with a '-', and must not contain consecutive dashes. Key names can
- * be up to 32 characters long.
+ * with a '-', and must not contain consecutive dashes.
  *
  * Similar to GConf, the default values in GSettings schemas can be
  * localized, but the localized values are stored in gettext catalogs