diff --git a/ChangeLog b/ChangeLog
index d4f8ca0447..07e4283802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2008-07-04  Matthias Clasen  <mclasen@redhat.com>\
+2008-07-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaccelgroup.c: Fix default value for modifier-mask property.
+
+2008-07-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenu.c: Debork the attach-widget property.
 
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 436e3c3f2f..0dbf810c75 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -95,7 +95,7 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class)
                                                        "Modifier Mask",
                                                        "Modifier Mask",
                                                        GDK_TYPE_MODIFIER_TYPE,
-                                                       0,
+                                                       default_accel_mod_mask,
                                                        G_PARAM_READABLE));
 
   /**
@@ -186,7 +186,7 @@ gtk_accel_group_get_property (GObject    *object,
       g_value_set_boolean (value, accel_group->lock_count > 0);
       break;
     case PROP_MODIFIER_MASK:
-      g_value_set_enum (value, accel_group->modifier_mask);
+      g_value_set_flags (value, accel_group->modifier_mask);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);