diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index acc7b7b..537070e 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Apr  1 14:15:28 UTC 2012 - dimstar@opensuse.org
+
+- Change /usr/bin/glxinfo Recommends to Mesa-demo-x Requires. Since
+  bnc#748373 has been resolved, we can require the real package
+  again.
+
 -------------------------------------------------------------------
 Mon Mar 26 17:37:25 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 0d81942..58d52cf 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -23,7 +23,6 @@
 Name:           gnome-control-center
 Version:        3.4.0
 Release:        0
-# FIXME: change /usr/bin/glxinfo to Recommends to real package name, and to Requires, once we know which package name to use (see bnc#748373)
 # FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
 Summary:        The GNOME Control Center
 License:        GPL-2.0+
@@ -83,6 +82,8 @@ BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xi) >= 1.2
 Requires:       %{name}-branding = %{version}
+# needed for glxinfo, used by System info panel
+Requires:       Mesa-demo-x
 # needed for printers panel
 Requires:       cups-pk-helper
 Requires:       gnome-menus
@@ -97,11 +98,6 @@ Recommends:     %{name}-user-faces
 Recommends:     apg
 # the printers panel can use the dbus service
 Recommends:     system-config-printer-dbus-service
-# /usr/bin/glxinfo is used by System info panel; we're using a path here since
-# the xorg-x11 packaging change brought a mess, and this is not packaged
-# anymore for now. It will come back, but we don't know in which package...
-# (see bnc#748373)
-Recommends:     /usr/bin/glxinfo
 Provides:       acme
 Provides:       fontilus
 Provides:       themus
@@ -121,9 +117,9 @@ various aspects of your desktop.
 Summary:        The GNOME Control Center -- Upstream Definition of Shell Content
 Group:          System/GUI/GNOME
 Requires:       %{name} = %{version}
+Supplements:    packageand(%{name}:branding-upstream)
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
-Supplements:    packageand(%{name}:branding-upstream)
 BuildArch:      noarch
 #BRAND: This package contains the definitions of the content appearing
 #BRAND: in the shell (/etc/xdg/menus/gnomecc.menu).
@@ -174,12 +170,12 @@ translation-update-upstream
 %endif
         --disable-static\
         --disable-maintainer-mode
-make %{?jobs:-j%jobs} V=1
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+%make_install
 %if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name}-2.0 %{?no_lang_C}
@@ -204,10 +200,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file gnome-wacom-panel X-SuSE-ControlCenter-Hardware
-%fdupes $RPM_BUILD_ROOT
+%fdupes %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %glib2_gsettings_schema_post