diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 9bf2314..7da898d 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Sep  8 00:19:09 CEST 2010 - vuntz@opensuse.org
+
+- Remove unneeded librsvg-devel BuildRequires.
+- Change old-style BuildRequires to pkgconfig() style
+  BuildRequires:
+  + old-style: evolution-data-server-devel, gnome-desktop-devel,
+    gnome-menus-devel, gnome-settings-daemon-devel,
+    libgnomekbd-devel, libslab-devel, libunique-devel,
+    libxklavier-devel, metacity-devel, xorg-x11
+  + new-style: dbus-1, dbus-glib-1, gconf-2.0, glib-2.0,
+    gnome-desktop-2.0, gnome-settings-daemon, gtk+-2.0,
+    libcanberra-gtk, libebook-1.2, libgnomekbd, libgnomekbdui,
+    libgnome-menu, libmetacity-private, libslab, libxklavier,
+    libxml-2.0, unique-1.0, xcursor, xft, xi.
+- This will make it easier to switch to GNOME 3 libraries.
+
+-------------------------------------------------------------------
+Mon Sep  6 14:45:31 CEST 2010 - vuntz@opensuse.org
+
+- Add X-SuSE-ControlCenter-Personal category instead of
+  X-SuSE-ControlCenter-System and AdvancedSettings to
+  default-applications.desktop to make it appear where it should
+  in the menu.
+- Add X-SuSE-ControlCenter-Hardware category instead of
+  X-SuSE-ControlCenter-System and AdvancedSettings to
+  gnome-network-properties.desktop to make it appear where it
+  should in the menu.
+
 -------------------------------------------------------------------
 Wed Sep  1 12:31:47 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index c0532fd..df707ee 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -20,24 +20,33 @@
 
 Name:           gnome-control-center
 BuildRequires:  desktop-file-utils
-BuildRequires:  evolution-data-server-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
-BuildRequires:  gnome-desktop-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-menus-devel
 BuildRequires:  gnome-patch-translation
-BuildRequires:  gnome-settings-daemon-devel
 BuildRequires:  intltool
-BuildRequires:  libgnomekbd-devel
-BuildRequires:  librsvg-devel
-BuildRequires:  libslab-devel
-BuildRequires:  libunique-devel
-BuildRequires:  libxklavier-devel
-BuildRequires:  metacity-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gnome-desktop-2.0)
+BuildRequires:  pkgconfig(gnome-settings-daemon)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(libcanberra-gtk)
+BuildRequires:  pkgconfig(libebook-1.2)
+BuildRequires:  pkgconfig(libgnomekbd)
+BuildRequires:  pkgconfig(libgnomekbdui)
+BuildRequires:  pkgconfig(libgnome-menu)
+BuildRequires:  pkgconfig(libmetacity-private)
+BuildRequires:  pkgconfig(libslab)
+BuildRequires:  pkgconfig(libxklavier)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(unique-1.0)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xi)
 License:        GPLv2+
 Group:          System/GUI/GNOME
 Obsoletes:      fontilus themus acme
@@ -136,10 +145,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings
 # capplets
 %suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal
-%suse_update_desktop_file default-applications X-SuSE-ControlCenter-System AdvancedSettings
+%suse_update_desktop_file default-applications X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware
 %suse_update_desktop_file gnome-about-me X-SuSE-ControlCenter-Personal
-%suse_update_desktop_file gnome-network-properties X-SuSE-ControlCenter-System AdvancedSettings
+%suse_update_desktop_file gnome-network-properties X-SuSE-ControlCenter-Hardware
 %suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware
 %suse_update_desktop_file gnome-appearance-properties X-SuSE-ControlCenter-LookAndFeel
 %suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal