diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 138cf07c97..220a51c33c 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -131,9 +131,9 @@
  *
  * It is also possible to bind a property value to another object's
  * property value using the attributes
- * "bind-source" to specify the source object of the binding,
- * "bind-property" to specify the source property and optionally
- * "bind-flags" to specify the binding flags
+ * "bind-source" to specify the source object of the binding, and
+ * optionally, "bind-property" and "bind-flags" to specify the
+ * source property and source binding flags respectively.
  * Internally builder implement this using GBinding objects.
  * For more information see g_object_bind_property()
  *
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index fc1c80db28..8a5a1608d6 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -598,7 +598,7 @@ parse_property (ParserData   *data,
 
   g_markup_parse_context_get_position (data->ctx, &line, &col);
 
-  if (bind_source && bind_property)
+  if (bind_source)
     {
       BindingInfo *binfo;
 
@@ -606,17 +606,17 @@ parse_property (ParserData   *data,
       binfo->target = NULL;
       binfo->target_pspec = pspec;
       binfo->source = g_strdup (bind_source);
-      binfo->source_property = g_strdup (bind_property);
+      binfo->source_property = bind_property ? g_strdup (bind_property) : g_strdup (name);
       binfo->flags = bind_flags;
       binfo->line = line;
       binfo->col = col;
 
       object_info->bindings = g_slist_prepend (object_info->bindings, binfo);
     }
-  else if (bind_source || bind_property)
+  else if (bind_property)
     {
       error_missing_attribute (data, element_name,
-                               (bind_source) ? "bind-property" : "bind-source",
+                               "bind-source",
                                error);
       return;
     }
@@ -626,7 +626,7 @@ parse_property (ParserData   *data,
   info->pspec = pspec;
   info->text = g_string_new ("");
   info->translatable = translatable;
-  info->bound = (bind_source && bind_property);
+  info->bound = bind_source != NULL;
   info->context = g_strdup (context);
   info->line = line;
   info->col = col;
diff --git a/gtk/tools/gtk4builder.rng b/gtk/tools/gtk4builder.rng
index 032d84d142..125051511c 100644
--- a/gtk/tools/gtk4builder.rng
+++ b/gtk/tools/gtk4builder.rng
@@ -103,9 +103,11 @@
           <attribute name="bind-source">
             <text/>
           </attribute>
-          <attribute name="bind-property">
-            <text/>
-          </attribute>
+          <optional>
+            <attribute name="bind-property">
+              <text/>
+            </attribute>
+          </optional>
           <optional>
             <attribute name="bind-flags">
               <text/>
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 9c3b16f17e..31e6915da4 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -2450,14 +2450,19 @@ test_property_bindings (void)
     "            <property name=\"sensitive\" bind-source=\"checkbutton\" bind-property=\"active\" />"
     "          </object>"
     "        </child>"
+    "        <child>"
+    "          <object class=\"GtkButton\" id=\"button3\">"
+    "            <property name=\"sensitive\" bind-source=\"button\" bind-flags=\"sync-create\" />"
+    "          </object>"
+    "        </child>"
     "      </object>"
     "    </child>"
     "  </object>"
     "</interface>";
 
   GtkBuilder *builder;
-  GObject *checkbutton, *button, *button2, *window;
-  
+  GObject *checkbutton, *button, *button2, *button3, *window;
+
   builder = builder_new_from_string (buffer, -1, NULL);
   
   checkbutton = gtk_builder_get_object (builder, "checkbutton");
@@ -2471,11 +2476,16 @@ test_property_bindings (void)
   button2 = gtk_builder_get_object (builder, "button2");
   g_assert (GTK_IS_BUTTON (button2));
   g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button2)));
-  
+
+  button3 = gtk_builder_get_object (builder, "button3");
+  g_assert (GTK_IS_BUTTON (button3));
+  g_assert (!gtk_widget_get_sensitive (GTK_WIDGET (button3)));
+
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
   g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button)));
   g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button2)));
-  
+  g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button3)));
+
   window = gtk_builder_get_object (builder, "window");
   gtk_widget_destroy (GTK_WIDGET (window));
   g_object_unref (builder);