diff --git a/fancontrol.service b/fancontrol.service
deleted file mode 100644
index 2e64b7b..0000000
--- a/fancontrol.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Start fan control, if configured
-ConditionFileNotEmpty=/etc/fancontrol
-After=lm_sensors.service
-
-[Service]
-Type=simple
-PIDFile=/var/run/fancontrol.pid
-EnvironmentFile=/etc/sysconfig/lm_sensors
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/lm_sensors-3.0.0-sysconfig_metadata.patch b/lm_sensors-3.0.0-sysconfig_metadata.patch
index bca4cf7..96ec9a7 100644
--- a/lm_sensors-3.0.0-sysconfig_metadata.patch
+++ b/lm_sensors-3.0.0-sysconfig_metadata.patch
@@ -4,7 +4,7 @@
 
 --- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
 +++ lm_sensors-3.3.2/prog/detect/sensors-detect
-@@ -6642,6 +6642,12 @@ sub write_config
+@@ -6693,6 +6693,12 @@ sub write_config
  			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
  		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
  		print SYSCONFIG <<'EOT';
diff --git a/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch b/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
index 5f669a4..22127f9 100644
--- a/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
+++ b/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
@@ -8,7 +8,7 @@ package if drivers are found to be missing.
 
 --- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
 +++ lm_sensors-3.3.2/prog/detect/sensors-detect
-@@ -2567,12 +2567,15 @@ sub initialize_conf
+@@ -2616,12 +2616,15 @@ sub initialize_conf
  # [2] -> SUBLEVEL
  # [3] -> EXTRAVERSION
  #
@@ -25,7 +25,7 @@ package if drivers are found to be missing.
  	chomp($kernel_arch = `uname -m`);
  
  	# We only support kernels >= 2.6.5
-@@ -6584,7 +6587,11 @@ sub generate_modprobes
+@@ -6635,7 +6638,11 @@ sub generate_modprobes
  			# isn't supported
  			if ((($? >> 8) == 0) && ! $modulefound) {
  				print "Warning: the required module $driver is not currently installed\n".
diff --git a/lm_sensors-3.3.3.tar.bz2 b/lm_sensors-3.3.3.tar.bz2
deleted file mode 100644
index 549b898..0000000
--- a/lm_sensors-3.3.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ecc91ba3d918e96fb7d5eb9acce978af803b130e0b33b08d5ea05b2bfca84955
-size 172467
diff --git a/lm_sensors-3.3.4.tar.bz2 b/lm_sensors-3.3.4.tar.bz2
new file mode 100644
index 0000000..8058784
--- /dev/null
+++ b/lm_sensors-3.3.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4608610cb5de4b24e3fe1ae357712e8633a8a929bbb42df5eecc4ccee6ba76d
+size 172226
diff --git a/lm_sensors-r6111-detection-Winbond-W83627SF.diff b/lm_sensors-r6111-detection-Winbond-W83627SF.diff
deleted file mode 100644
index baa72d5..0000000
--- a/lm_sensors-r6111-detection-Winbond-W83627SF.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Add detection of Winbond W83627SF/GF (no sensors)
-Upstream: yes, r6111
-
----
- prog/detect/sensors-detect |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- lm_sensors-3.3.3.orig/prog/detect/sensors-detect
-+++ lm_sensors-3.3.3/prog/detect/sensors-detect
-@@ -1945,6 +1945,10 @@ use constant FEAT_SMBUS	=> (1 << 7);
- 		logdev => 0x0b,
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- 	}, {
-+		name => "Winbond W83627SF/GF Super IO",
-+		driver => "not-a-sensor",
-+		devid => 0x59,
-+	}, {
- 		name => "Winbond W83627THF/THG Super IO Sensors",
- 		driver => "w83627hf",
- 		devid => 0x82,
diff --git a/lm_sensors-r6112-detection-AMD-family-16h.diff b/lm_sensors-r6112-detection-AMD-family-16h.diff
deleted file mode 100644
index 889429b..0000000
--- a/lm_sensors-r6112-detection-AMD-family-16h.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Add detection of AMD family 16h power sensors
-Upstream: yes, r6112
-
----
- prog/detect/sensors-detect |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- lm_sensors-3.3.3.orig/prog/detect/sensors-detect
-+++ lm_sensors-3.3.3/prog/detect/sensors-detect
-@@ -2353,6 +2353,10 @@ use vars qw(@cpu_ids);
- 		driver => "fam15h_power",
- 		detect => sub { amd_pci_detect('1604') },
- 	}, {
-+		name => "AMD Family 16h power sensors",
-+		driver => "fam15h_power",
-+		detect => sub { amd_pci_detect('1534') },
-+	}, {
- 		name => "Intel digital thermal sensor",
- 		driver => "coretemp",
- 		detect => \&coretemp_detect,
diff --git a/lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff b/lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff
deleted file mode 100644
index cdbe1a6..0000000
--- a/lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Subject: Map ITE IT8771E, IT8772E, IT8782F and IT8783F to it87
-Upstream: yes, r6113
-
----
- prog/detect/sensors-detect |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- lm_sensors-3.3.3.orig/prog/detect/sensors-detect
-+++ lm_sensors-3.3.3/prog/detect/sensors-detect
-@@ -2225,13 +2225,13 @@ use constant FEAT_SMBUS	=> (1 << 7);
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- 	}, {
- 		name => "ITE IT8771E Super IO Sensors",
--		driver => "to-be-written",	# it87
-+		driver => "it87",
- 		devid => 0x8771,
- 		logdev => 0x04,
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- 	}, {
- 		name => "ITE IT8772E Super IO Sensors",
--		driver => "to-be-written",	# it87
-+		driver => "it87",
- 		devid => 0x8772,
- 		logdev => 0x04,
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-@@ -2243,13 +2243,13 @@ use constant FEAT_SMBUS	=> (1 << 7);
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- 	}, {
- 		name => "ITE IT8782F Super IO Sensors",
--		driver => "to-be-written",	# it87
-+		driver => "it87",
- 		devid => 0x8782,
- 		logdev => 0x04,
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- 	}, {
- 		name => "ITE IT8783F Super IO Sensors",
--		driver => "to-be-written",	# it87
-+		driver => "it87",
- 		devid => 0x8783,
- 		logdev => 0x04,
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
diff --git a/lm_sensors-r6117-detection-ITE-IT8752F.diff b/lm_sensors-r6117-detection-ITE-IT8752F.diff
deleted file mode 100644
index b9da3aa..0000000
--- a/lm_sensors-r6117-detection-ITE-IT8752F.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: Add detection of ITE IT8752F
-Upstream: yes, r6117
-
----
- prog/detect/sensors-detect |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- lm_sensors-3.3.3.orig/prog/detect/sensors-detect
-+++ lm_sensors-3.3.3/prog/detect/sensors-detect
-@@ -2224,6 +2224,12 @@ use constant FEAT_SMBUS	=> (1 << 7);
- 		logdev => 0x04,
- 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
- 	}, {
-+		name => "ITE IT8752F Super IO Sensors",
-+		driver => "to-be-written",	# it87
-+		devid => 0x8752,
-+		logdev => 0x04,
-+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-+	}, {
- 		name => "ITE IT8771E Super IO Sensors",
- 		driver => "it87",
- 		devid => 0x8771,
diff --git a/lm_sensors-r6123-AnalogDev-ADT7410-driver.diff b/lm_sensors-r6123-AnalogDev-ADT7410-driver.diff
deleted file mode 100644
index a824d98..0000000
--- a/lm_sensors-r6123-AnalogDev-ADT7410-driver.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Subject: Update Analog Devices ADT7410 detection
-Upstream: yes, r6123
-
-We have a driver for the ADT7410 since kernel 3.7.
-ADT7420 is register compatible with the ADT7410.
-
----
- prog/detect/sensors-detect |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- lm_sensors-3.3.3.orig/prog/detect/sensors-detect
-+++ lm_sensors-3.3.3/prog/detect/sensors-detect
-@@ -637,8 +637,8 @@ use vars qw(@i2c_adapter_names);
- 		i2c_addrs => [0x2c..0x2e],
- 		i2c_detect => sub { adt7490_detect(@_); },
- 	}, {
--		name => "Analog Devices ADT7410",
--		driver => "to-be-written",
-+		name => "Analog Devices ADT7410/ADT7420",
-+		driver => "adt7410",
- 		i2c_addrs => [0x48..0x4b],
- 		i2c_detect => sub { adt7410_detect(@_); },
- 	}, {
diff --git a/lm_sensors-r6163-pwmconfig-raise-threshold.diff b/lm_sensors-r6163-pwmconfig-raise-threshold.diff
deleted file mode 100644
index 79603c2..0000000
--- a/lm_sensors-r6163-pwmconfig-raise-threshold.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: pwmconfig: Raise the detection threshold to 3/4
-Upstream: yes, r6163
-References: bnc#810344
-
-Detection threshold of 2/3 of the maximum speed is too low, some fans
-will slow down to about that speed so controlled fans may be missed.
-Use 3/4 as the threshold to avoid these false negatives.
----
- prog/pwm/pwmconfig |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/prog/pwm/pwmconfig
-+++ b/prog/pwm/pwmconfig
-@@ -448,7 +448,7 @@ do
- 		OS=`echo $SPEEDS | cut -d' ' -f$count`
- 		S=`echo $CURRENT_SPEEDS | cut -d' ' -f$count`
- 		echo "  $j ... speed was $OS now $S"
--		let threshold=2*$OS/3
-+		let threshold=3*$OS/4
- 		if [ $S -lt $threshold ]
- 		then
- 			echo "    It appears that fan $j"
diff --git a/lm_sensors-r6164-pwmconfig-drop-comment.diff b/lm_sensors-r6164-pwmconfig-drop-comment.diff
deleted file mode 100644
index 75220c2..0000000
--- a/lm_sensors-r6164-pwmconfig-drop-comment.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: pwmconfig: Drop a stray comment
-Upstream: yes, r6164
-
-fancontrol supports multiple controlled fans for quite some time now.
----
- prog/pwm/pwmconfig |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/prog/pwm/pwmconfig
-+++ b/prog/pwm/pwmconfig
-@@ -471,7 +471,7 @@ do
- 					exit 1
- 				fi
- 			else
--				fanactive="$j+${fanactive}" #not supported yet by fancontrol
-+				fanactive="$j+${fanactive}"
- 				fanactive_min="$S+${fanactive_min}"
- 			fi
- 			S=`cat $j`
diff --git a/lm_sensors-r6165-pwmconfig-multiple-fans.diff b/lm_sensors-r6165-pwmconfig-multiple-fans.diff
deleted file mode 100644
index d7eadbb..0000000
--- a/lm_sensors-r6165-pwmconfig-multiple-fans.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-Subject: pwmconfig: Properly deal with multiple fan control
-Upstream: yes, r6165
-References: bnc#810344
-
-When a given PWM output controls more than one fan,
-fanactive_min is no longer a space-separated list of numbers, it will
-also include items of the form "A+B". The tests in the rest of the
-code do not expect that and choke with errors like:
-
-/usr/sbin/pwmconfig: line 926: [: 538+799: integer expression expected
-/usr/sbin/pwmconfig: line 952: [: 538+799: integer expression expected
-
-As the only thing we really care about is whether any fan stops
-completely when PWM is 0, we can simply record the minimum of the
-lowest speed of all affected fans.
----
- prog/pwm/pwmconfig |   13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
---- a/prog/pwm/pwmconfig
-+++ b/prog/pwm/pwmconfig
-@@ -443,6 +443,7 @@ do
- 
- 	let pwmactivecount=0
- 	let count=1
-+	S_MIN=
- 	for j in $GOODFAN
- 	do
- 		OS=`echo $SPEEDS | cut -d' ' -f$count`
-@@ -461,7 +462,6 @@ do
- 				let pwmactivecount=1
- 				pwmactive="$i ${pwmactive}"
- 				fanactive="$j ${fanactive}"
--				fanactive_min="$S ${fanactive_min}"
- 
- 				# Give all correlated fans time to return to full speed
- 				sleep $DELAY
-@@ -472,8 +472,14 @@ do
- 				fi
- 			else
- 				fanactive="$j+${fanactive}"
--				fanactive_min="$S+${fanactive_min}"
- 			fi
-+
-+			# Keep track of the slowest fan controlled by one PWM
-+			if [ -z "$S_MIN" ] || [ $S -lt $S_MIN ]
-+			then
-+				S_MIN=$S
-+			fi
-+
- 			S=`cat $j`
- 			if [ $S -lt $threshold ]
- 			then
-@@ -506,8 +512,11 @@ do
- 		if [ "$X" = "y" -o "$X" = "Y" ]
- 		then
- 			pwmactive="$i ${pwmactive}"
-+			fanactive_min="0 $fanactive_min"
- 		fi
- 		echo
-+	else
-+		fanactive_min="$S_MIN $fanactive_min"
- 	fi
- done
- 
diff --git a/lm_sensors-r6172-fancontrol-absolute-paths.diff b/lm_sensors-r6172-fancontrol-absolute-paths.diff
deleted file mode 100644
index c5abb78..0000000
--- a/lm_sensors-r6172-fancontrol-absolute-paths.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Subject: fancontrol: Fix handling of absolute paths in config
-Upstream: yes, r6172
-References: bnc#810344
-
-Reported by Marc Ferland. Make DEVPATH and DEVNAME mandatory only when
-using relative paths. Optionally support DEVNAME check when using
-absolute paths.
----
- prog/pwm/fancontrol |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/prog/pwm/fancontrol
-+++ b/prog/pwm/fancontrol
-@@ -289,11 +289,16 @@ fi
- cd $DIR
- 
- # Check for configuration change
--if [ -z "$DEVPATH" -o -z "$DEVNAME" ]
-+if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
- then
- 	echo "Configuration is too old, please run pwmconfig again" >&2
- 	exit 1
- fi
-+if [ "$DIR" = "/" -a -n "$DEVPATH" ]
-+then
-+	echo "Unneeded DEVPATH with absolute device paths" >&2
-+	exit 1
-+fi
- if ! ValidateDevices "$DEVPATH" "$DEVNAME"
- then
- 	echo "Configuration appears to be outdated, please run pwmconfig again" >&2
diff --git a/lm_sensors-r6181-fix-service-files.patch b/lm_sensors-r6181-fix-service-files.patch
new file mode 100644
index 0000000..c9d407f
--- /dev/null
+++ b/lm_sensors-r6181-fix-service-files.patch
@@ -0,0 +1,31 @@
+Subject: Fix EnvironmentFile in service files
+Upstream: yes, r6181
+
+* EnvironmentFile is mandatory for sensord.
+* fancontrol needs no EnvironmentFile.
+---
+ prog/init/fancontrol.service |    1 -
+ prog/init/sensord.service    |    2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+--- a/prog/init/fancontrol.service
++++ b/prog/init/fancontrol.service
+@@ -4,7 +4,6 @@ ConditionFileNotEmpty=/etc/fancontrol
+ After=lm_sensors.service
+ 
+ [Service]
+-EnvironmentFile=/etc/sysconfig/lm_sensors
+ Type=simple
+ PIDFile=/var/run/fancontrol.pid
+ ExecStart=/usr/sbin/fancontrol
+--- a/prog/init/sensord.service
++++ b/prog/init/sensord.service
+@@ -4,7 +4,7 @@ After=lm_sensors.service
+ After=syslog.target
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/sensord
++EnvironmentFile=/etc/sysconfig/sensord
+ Type=forking
+ PIDFile=/var/run/sensord.pid
+ ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon
diff --git a/sensors.changes b/sensors.changes
index c856b24..18b1f50 100644
--- a/sensors.changes
+++ b/sensors.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Jun  3 13:55:39 CEST 2013 - jdelvare@suse.de
+
+- Update to lm_sensors 3.3.4
+  * Mostly a packaging-only clean-up, as we had backported most
+    important changes already.
+  * lm_sensors-r6111-detection-Winbond-W83627SF.diff,
+    lm_sensors-r6112-detection-AMD-family-16h.diff,
+    lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff,
+    lm_sensors-r6117-detection-ITE-IT8752F.diff,
+    lm_sensors-r6123-AnalogDev-ADT7410-driver.diff,
+    lm_sensors-r6163-pwmconfig-raise-threshold.diff,
+    lm_sensors-r6164-pwmconfig-drop-comment.diff,
+    lm_sensors-r6165-pwmconfig-multiple-fans.diff,
+    lm_sensors-r6172-fancontrol-absolute-paths.diff: Removed,
+    upstream now.
+  * fancontrol.service: Removed, now provided by upstream,
+    together with sensord.service.
+  * lm_sensors-3.0.0-sysconfig_metadata.patch,
+    lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
+- lm_sensors-r6181-fix-service-files.patch: Fix EnvironmentFile
+  in service files
+
 -------------------------------------------------------------------
 Thu May 23 18:30:31 CEST 2013 - jdelvare@suse.de
 
diff --git a/sensors.spec b/sensors.spec
index b8fdfd7..98b4fdd 100644
--- a/sensors.spec
+++ b/sensors.spec
@@ -21,7 +21,7 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  rrdtool-devel
 Url:            http://www.lm-sensors.org/
-Version:        3.3.3
+Version:        3.3.4
 Release:        0
 Summary:        Hardware health monitoring for Linux
 License:        GPL-2.0+
@@ -30,20 +30,11 @@ Requires:       modutils
 Source0:        http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-%{version}.tar.bz2
 Source1:        lm_sensors.init
 Source2:        baselibs.conf
-Source3:        fancontrol.service
 Patch1:         lm_sensors-3.1.1-build.patch
 Patch2:         lm_sensors-3.0.0-sensord-separate.patch
 Patch3:         lm_sensors-3.0.0-sysconfig_metadata.patch
 Patch4:         lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
-Patch5:         lm_sensors-r6111-detection-Winbond-W83627SF.diff
-Patch6:         lm_sensors-r6112-detection-AMD-family-16h.diff
-Patch7:         lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff
-Patch8:         lm_sensors-r6117-detection-ITE-IT8752F.diff
-Patch9:         lm_sensors-r6123-AnalogDev-ADT7410-driver.diff
-Patch10:        lm_sensors-r6163-pwmconfig-raise-threshold.diff
-Patch11:        lm_sensors-r6164-pwmconfig-drop-comment.diff
-Patch12:        lm_sensors-r6165-pwmconfig-multiple-fans.diff
-Patch13:        lm_sensors-r6172-fancontrol-absolute-paths.diff
+Patch5:         lm_sensors-r6181-fix-service-files.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
@@ -147,14 +138,6 @@ Authors:
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -176,8 +159,8 @@ make %{?_smp_mflags} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} M
     mkdir -p				$RPM_BUILD_ROOT/etc/init.d
     install -m 0755 %{S:1}		$RPM_BUILD_ROOT/etc/init.d/lm_sensors
     ln -sf /etc/init.d/lm_sensors	$RPM_BUILD_ROOT/usr/sbin/rclm_sensors
-    install -D -m 0644 prog/init/lm_sensors.service %{buildroot}%{_unitdir}/lm_sensors.service
-    install -D -m 0644 %{SOURCE3}                   %{buildroot}%{_unitdir}/fancontrol.service
+    mkdir -p				$RPM_BUILD_ROOT/%{_unitdir}
+    cp -a prog/init/*.service 		$RPM_BUILD_ROOT/%{_unitdir}/
 
 %pre
 %service_add_pre lm_sensors.service
@@ -244,6 +227,7 @@ fi
 
 %files -n sensord
 %defattr(-,root,root)
+%{_unitdir}/sensord.service
 /usr/sbin/sensord
 %doc /usr/share/man/man8/sensord.8.gz