diff --git a/capplets/keyboard/Bonobo_Control_Capplet_keyboard_properties.oaf b/capplets/keyboard/Bonobo_Control_Capplet_keyboard_properties.oaf
index 45eb027ec..e8d217985 100644
--- a/capplets/keyboard/Bonobo_Control_Capplet_keyboard_properties.oaf
+++ b/capplets/keyboard/Bonobo_Control_Capplet_keyboard_properties.oaf
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Bonobo_Control_Capplet_keyboard_properties_Factory" type="exe" location="keyboard-properties-capplet">
+<oaf_server iid="OAFIID:Bonobo_Control_Capplet_keyboard_properties_Factory" type="exe" location="keyboard-properties">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index f97f4e1b5..1eff644d5 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-19  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Bonobo_Control_Capplet_keyboard_properties.oaf: Update to
+	correct binary name
+
+	* main.c (create_dialog): Use GNOMECC_GLADE_DIR rather than
+	GLADE_DATADIR
+
 2001-07-18  Richard Hestilow  <hestilow@ximian.com>
 
 	* main.c (create_dialog): Revert to old prototype.
diff --git a/capplets/keyboard/main.c b/capplets/keyboard/main.c
index d9c2af707..a5cefdef5 100644
--- a/capplets/keyboard/main.c
+++ b/capplets/keyboard/main.c
@@ -130,7 +130,7 @@ create_dialog (void)
 	GladeXML *dialog;
 	GtkWidget *widget, *pixmap;
 
-	dialog = glade_xml_new (GLADE_DATADIR "/keyboard-properties.glade", "prefs_widget");
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/keyboard-properties.glade", "prefs_widget");
 	widget = glade_xml_get_widget (dialog, "prefs_widget");
 	gtk_object_set_data (GTK_OBJECT (widget), "glade-data", dialog);