diff --git a/ChangeLog b/ChangeLog
index 139a425de6..195b0c43a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-06-27  Johan Dahlin  <jdahlin@async.com.br>
 
+	* gtk/gtkbuilderparser.c (parse_property): Use
+	the attribute name in the error message instead of
+	the value.
+	
 	* demos/gtk-demo/demo.ui: Set name of Help menu
 	to HelpMenu
 
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 87fd6231aa..a619a1f507 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -211,7 +211,7 @@ parse_object (ParserData   *data,
         constructor = g_strdup (values[i]);
       else
 	{
-	  error_invalid_attribute (data, element_name, values[i], error);
+	  error_invalid_attribute (data, element_name, names[i], error);
 	  return;
 	}
     }
@@ -318,7 +318,7 @@ parse_child (ParserData   *data,
             }
         }
       else
-	error_invalid_attribute (data, element_name, values[i], error);
+	error_invalid_attribute (data, element_name, names[i], error);
     }
 
   child_info->parent = (CommonInfo*)object_info;
@@ -356,7 +356,7 @@ parse_property (ParserData   *data,
         translatable = strcmp (values[i], "yes") == 0;
       else
 	{
-	  error_invalid_attribute (data, element_name, values[i], error);
+	  error_invalid_attribute (data, element_name, names[i], error);
 	  return;
 	}
     }
@@ -418,7 +418,7 @@ parse_signal (ParserData   *data,
         object = g_strdup (values[i]);
       else
 	{
-	  error_invalid_attribute (data, element_name, values[i], error);
+	  error_invalid_attribute (data, element_name, names[i], error);
 	  return;
 	}
     }
@@ -480,7 +480,7 @@ parse_interface (ParserData   *data,
 	  break;
 	}
       else
-	error_invalid_attribute (data, "interface", values[i], error);
+	error_invalid_attribute (data, "interface", names[i], error);
     }
 }