diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 77638db56..b7b0e5ef8 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-08  Jens Granseuer  <jensgr@gmx.net>
+
+	* Makefile.am:
+	* default-applications-accessibility.desktop.in.in:
+	* default-applications.desktop.in.in:
+	* gnome-at-mobility.desktop.in.in:
+	* gnome-at-session.desktop.in.in:
+	* gnome-at-visual.desktop.in.in: fix bugzilla info and clean up the
+	Makefile a bit
+
 2007-07-07  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-da-capplet.c: (entry_focus_out_event_cb),
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index c1a17cfaf..4388dac33 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -13,8 +13,8 @@ gnome_default_applications_properties_SOURCES = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir   = $(pkgdatadir)/glade
-glade_DATA = gnome-default-applications-properties.glade
+gladedir = $(pkgdatadir)/glade
+dist_glade_DATA = gnome-default-applications-properties.glade
 
 gnome-at-visual: gnome-at-commandline.in
 	cp $< $@
@@ -23,9 +23,11 @@ gnome-at-mobility: gnome-at-commandline.in
 	cp $< $@
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = default-applications.desktop.in \
+Desktop_in_files = \
+	default-applications.desktop.in \
 	default-applications-accessibility.desktop.in \
-	gnome-at-visual.desktop.in gnome-at-mobility.desktop.in
+	gnome-at-mobility.desktop.in \
+	gnome-at-visual.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 autostartdir = $(datadir)/gnome/autostart
@@ -44,7 +46,6 @@ INCLUDES   = 					\
 	-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) $(autostart_DATA)
-EXTRA_DIST = $(glade_DATA) gnome-default-applications.xml.in
+EXTRA_DIST = $(xmldata_in_files)
 
diff --git a/capplets/default-applications/default-applications-accessibility.desktop.in.in b/capplets/default-applications/default-applications-accessibility.desktop.in.in
index f8cb45808..3805ab074 100644
--- a/capplets/default-applications/default-applications-accessibility.desktop.in.in
+++ b/capplets/default-applications/default-applications-accessibility.desktop.in.in
@@ -11,5 +11,5 @@ Categories=GNOME;GTK;Settings;Accessibility;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=other capplets
+X-GNOME-Bugzilla-Component=Preferred applications
 X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/capplets/default-applications/default-applications.desktop.in.in b/capplets/default-applications/default-applications.desktop.in.in
index 382515274..bc84c446b 100644
--- a/capplets/default-applications/default-applications.desktop.in.in
+++ b/capplets/default-applications/default-applications.desktop.in.in
@@ -10,6 +10,6 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=control-center
-X-GNOME-Bugzilla-Component=other capplets
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=Preferred applications
 X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/capplets/default-applications/gnome-at-mobility.desktop.in.in b/capplets/default-applications/gnome-at-mobility.desktop.in.in
index c9a6a29ac..940f93e96 100644
--- a/capplets/default-applications/gnome-at-mobility.desktop.in.in
+++ b/capplets/default-applications/gnome-at-mobility.desktop.in.in
@@ -10,6 +10,6 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;Accessibility;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=other capplets
 X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/capplets/default-applications/gnome-at-session.desktop.in.in b/capplets/default-applications/gnome-at-session.desktop.in.in
index 9c734e824..1169e2e08 100644
--- a/capplets/default-applications/gnome-at-session.desktop.in.in
+++ b/capplets/default-applications/gnome-at-session.desktop.in.in
@@ -10,7 +10,7 @@ StartupNotify=true
 Categories=
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=other capplets
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Autostart-enabled=true
diff --git a/capplets/default-applications/gnome-at-visual.desktop.in.in b/capplets/default-applications/gnome-at-visual.desktop.in.in
index c25f63903..bb05d4b7a 100644
--- a/capplets/default-applications/gnome-at-visual.desktop.in.in
+++ b/capplets/default-applications/gnome-at-visual.desktop.in.in
@@ -10,6 +10,6 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;Accessibility;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=other capplets
 X-GNOME-Bugzilla-Version=@VERSION@