diff --git a/.cvsignore b/.cvsignore
index cfa8e27..48f1676 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lm_sensors-3.0.3.tar.bz2
+lm_sensors-3.1.0.tar.bz2
diff --git a/lm_sensors.spec b/lm_sensors.spec
index b582883..6816870 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,14 +1,12 @@
 Name: lm_sensors
-Version: 3.0.3
-Release: 2%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
 URL: http://www.lm-sensors.org/
 Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
 Source1: lm_sensors.sysconfig
 # these 2 were taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
 Source3: sensord.init
-# submitted to upstream mailinglist
-Patch0: lm_sensors-3.0.3-acpi-bus.patch
 Summary: Hardware monitoring tools
 Group: Applications/System
 License: GPLv2+
@@ -50,7 +48,6 @@ database, and warns of sensor alarms.
 
 %prep
 %setup -q
-%patch0 -p0
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
 
@@ -67,12 +64,11 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} PROG_EXTRA=sensord \
   DESTDIR=$RPM_BUILD_ROOT user_install
 rm $RPM_BUILD_ROOT%{_libdir}/libsensors.a
 
-# Remove userland kernel headers, belong in glibc-kernheaders.
-rm -rf $RPM_BUILD_ROOT%{_includedir}/linux
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensord
+install -p -m 755 prog/init/sysconfig-lm_sensors-convert \
+  $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -p -m 755 prog/init/lm_sensors.init \
   $RPM_BUILD_ROOT%{_initrddir}/lm_sensors
@@ -104,6 +100,10 @@ if [ -f /etc/sensors.conf.rpmsave.old ]; then
   mv /etc/sensors.conf.rpmsave.old /etc/sensors.conf.rpmsave
 fi
 
+# for conversion of /etc/sysconfig/lm_sensors format change
+%triggerpostun -- lm_sensors <= 3.0.3
+%{_bindir}/sysconfig-lm_sensors-convert
+
 
 %pre
 if [ -f /var/lock/subsys/sensors ]; then
@@ -164,6 +164,9 @@ fi
 
 
 %changelog
+* Sun Mar  8 2009 Hans de Goede <hdegoede@redhat.com> 3.1.0-1
+- New upstream release 3.1.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index d3497c9..47ebbc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e88b236228ac2a50821217015b8fd0fa  lm_sensors-3.0.3.tar.bz2
+e23130eaa46c66b861729835e08bdccf  lm_sensors-3.1.0.tar.bz2