diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes
index 43c5c2f..8853262 100644
--- a/gnome-system-monitor.changes
+++ b/gnome-system-monitor.changes
@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-Fri May 28 00:45:03 CEST 2010 - vuntz@opensuse.org
-
-- Drop gnome-system-monitor-fate302198.diff and
-  gnome-system-monitor-fate304741.diff: those patches were not
-  accepted upstream. One depends on HAL (which we don't want) and
-  provides an UI that is suboptimal to list the hardware; the other
-  one is specific to thinkpads and doesn't bring enough benefits to
-  be kept.
-- Drop hal-devel and hwinfo-devel BuildRequires.
-- Remove autoreconf call, and remove non-existing --enable-pcrecpp
-  configure option.
-
 -------------------------------------------------------------------
 Tue Mar 30 19:45:52 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 47c00d6..faad112 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -33,11 +33,17 @@ BuildRequires:  librsvg-devel
 BuildRequires:  libwnck-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  hal-devel
+BuildRequires:  hwinfo-devel
 License:        GPLv2+
 Group:          System/GUI/GNOME
 Version:        2.28.1
 Release:        1
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2
+# PATCH-FEATURE-OPENSUSE gnome-system-monitor-fate302198.diff FATE#302198 bgo582311 hfiguiere@novell.com -- Add a hardware tab
+Patch1:         gnome-system-monitor-fate302198.diff
+# PATCH-FEATURE-OPENSUSE gnome-system-monitor-fate304741.diff FATE#304741 bgo582312 hfiguiere@novell.com -- Add a thinkpad tab
+Patch2:         gnome-system-monitor-fate304741.diff
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Simple Process Monitor
@@ -60,10 +66,14 @@ Authors:
 %lang_package
 %prep
 %setup -q
+%patch1
+%patch2 -p1
 
 %build
+autoreconf -si
 %configure \
-    --disable-scrollkeeper
+    --disable-scrollkeeper \
+    --enable-pcrecpp
 %__make %{?jobs:-j%jobs}
 
 %install