diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 1ed52d7bd..47538f818 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-13  Jens Granseuer  <jensgr@gmx.net>
+
+	* Makefile.am:
+	* gnome-da-capplet.c: (show_dialog):
+	* gnome-da-xml.c: (gnome_da_xml_load_list): really fix DATADIR and
+	make directory definitions more consistent with other capplets.
+	Closes bug #407597.
+
 2007-02-03  Jens Granseuer  <jensgr@gmx.net>
 
 	* Makefile.am: fix DATADIR define
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index ef2e933fa..a5afc8c86 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -19,16 +19,16 @@ Desktop_in_files = default-applications.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 xmldata_in_files = gnome-default-applications.xml.in
-xmldatadir = $(pkgdatadir)/gnome-default-applications
+xmldatadir = $(pkgdatadir)
 xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 INCLUDES   = 					\
 	$(GNOMECC_CAPPLETS_CFLAGS)		\
 	$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS)	\
-	-DGLADEDIR=\""$(gladedir)"\"		\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
-	-DDATADIR=\""$(xmldatadir)"\"
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
+	-DGNOMECC_GLADE_DIR=\""$(gladedir)"\"	\
+	-DGNOMECC_DATA_DIR=\""$(pkgdatadir)"\"
 
 noinst_DATA = gnome-default-applications.xml.in
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA)
diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c
index 33e61126f..45631054e 100644
--- a/capplets/default-applications/gnome-da-capplet.c
+++ b/capplets/default-applications/gnome-da-capplet.c
@@ -746,8 +746,8 @@ show_dialog (GnomeDACapplet *capplet)
 {
     GConfValue *value;
 
-    if (g_file_test (GLADEDIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) {
-	capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties.glade", NULL, NULL);
+    if (g_file_test (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) {
+	capplet->xml = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", NULL, NULL);
     }
     else {
 	capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL);
diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c
index ec3936871..5713d1a9b 100644
--- a/capplets/default-applications/gnome-da-xml.c
+++ b/capplets/default-applications/gnome-da-xml.c
@@ -219,8 +219,7 @@ gnome_da_xml_load_list (GnomeDACapplet *capplet)
 {
     gchar *filename;
 
-    filename = g_build_filename (DATADIR,
-				 "gnome-default-applications",
+    filename = g_build_filename (GNOMECC_DATA_DIR,
 				 "gnome-default-applications.xml",
 				 NULL);