diff --git a/ChangeLog b/ChangeLog
index 1edc1ff70..5ec33136c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-17  Denis Washington  <dwashington@gmx.net>
+
+	* capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in:
+	* capplets/accessibility/at-properties/at-properties.desktop.in.in:
+	* capplets/network/gnome-network-preferences.desktop.in.in:
+	* capplets/default-applications/default-applications.desktop.in.in:
+	* capplets/about-me/gnome-about-me.desktop.in.in:
+
+	Replace the non-standard-compilant categories PersonalSettings,
+	NetworkSettings and SystemSettings with X-GNOME-*.
+
 2007-01-09  Thomas Wood  <thos@gnome.org>
 
 	* Makefile.am: Fix for distcheck
diff --git a/capplets/about-me/gnome-about-me.desktop.in.in b/capplets/about-me/gnome-about-me.desktop.in.in
index e289ddb98..18893df80 100644
--- a/capplets/about-me/gnome-about-me.desktop.in.in
+++ b/capplets/about-me/gnome-about-me.desktop.in.in
@@ -7,7 +7,7 @@ Icon=user-info
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;PersonalSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=control-center
diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in.in b/capplets/accessibility/at-properties/at-properties.desktop.in.in
index bf8c9d570..92c8f9548 100644
--- a/capplets/accessibility/at-properties/at-properties.desktop.in.in
+++ b/capplets/accessibility/at-properties/at-properties.desktop.in.in
@@ -7,7 +7,7 @@ Icon=gnome-settings-accessibility-technologies
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;PersonalSettings;Accessibility;
+Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=control-center
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
index 2baab4fb5..7be01f554 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
@@ -7,7 +7,7 @@ Icon=gnome-settings-accessibility-keyboard
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;PersonalSettings;Accessibility;
+Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=control-center
diff --git a/capplets/default-applications/default-applications.desktop.in.in b/capplets/default-applications/default-applications.desktop.in.in
index 9ca109bda..382515274 100644
--- a/capplets/default-applications/default-applications.desktop.in.in
+++ b/capplets/default-applications/default-applications.desktop.in.in
@@ -7,7 +7,7 @@ Icon=gnome-settings-default-applications
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;PersonalSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=control-center
diff --git a/capplets/network/gnome-network-preferences.desktop.in.in b/capplets/network/gnome-network-preferences.desktop.in.in
index ea2334953..223921912 100644
--- a/capplets/network/gnome-network-preferences.desktop.in.in
+++ b/capplets/network/gnome-network-preferences.desktop.in.in
@@ -7,7 +7,7 @@ Icon=stock_proxy
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;NetworkSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=control-center