diff --git a/cpupower-3.14.tar.bz2 b/cpupower-3.14.tar.bz2
new file mode 100644
index 0000000..006be9d
--- /dev/null
+++ b/cpupower-3.14.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73a55c6cf0701186077c087f456ddd664b6c4601532d68f4bca63eb8eab418ee
+size 71414
diff --git a/cpupower.changes b/cpupower.changes
index 7494b72..6207788 100644
--- a/cpupower.changes
+++ b/cpupower.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 28 19:35:10 UTC 2014 - trenn@suse.de
+
+- Update to latest turbostat version (git 2d6e532279ddf30188d5fbd)
+  bnc#866862, bnc#869071, bnc#869809
+- Adjust MSR include path
+  add make_header_file_passable_from_outside.patch
+
 -------------------------------------------------------------------
 Fri Mar 28 19:05:46 UTC 2014 - trenn@suse.de
 
diff --git a/cpupower.spec b/cpupower.spec
index 02f3fc6..64f6d3d 100644
--- a/cpupower.spec
+++ b/cpupower.spec
@@ -17,13 +17,14 @@
 #
 
 
+
 Name:           cpupower
 Url:            http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 # Use this as version when things are in mainline kernel
 %define version %(rpm -q --qf '%{VERSION}' kernel-source)
 Version:        3.13
 Release:        0
-%define tsversion      3.13
+%define tsversion      3.14
 Summary:        Tools to determine and set CPU Power related Settings
 License:        GPL-2.0
 Group:          System/Base
@@ -33,6 +34,7 @@ Source2:        cpupower_export_tarball_from_git.sh
 Patch1:         cpupower_disable_by_latency.patch
 Patch2:         add_idle_manpages_in_Makefile.patch
 Patch20:        turbostat_fix_man_perm.patch
+Patch21:        make_header_file_passable_from_outside.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gettext-tools
 BuildRequires:  pciutils
@@ -81,6 +83,7 @@ powersave module.
 %patch2 -p1
 cd ../turbostat-%{tsversion}
 %patch20 -p1
+%patch21 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
@@ -92,7 +95,7 @@ make $CONF %{?_smp_mflags}
 
 %ifarch ix86 x86_64
 cd ../turbostat-%{tsversion}
-make %{?_smp_mflags}
+CFLAGS="%optflags -I. -DMSRHEADER=\"<asm/msr-index.h>\"" make %{?_smp_mflags}
 %endif
 
 %install
diff --git a/cpupower_export_tarball_from_git.sh b/cpupower_export_tarball_from_git.sh
index 61cd2f6..82e2572 100644
--- a/cpupower_export_tarball_from_git.sh
+++ b/cpupower_export_tarball_from_git.sh
@@ -60,7 +60,7 @@ set -x
 git archive --format=tar $GIT_TAG tools/power/x86/turbostat |tar -x
 mv tools/power/x86/turbostat turbostat${VERSION}
 mkdir turbostat${VERSION}/asm
-cp "${GIT_DIR}"/../arch/x86/include/uapi/asm/msr-index.h turbostat${VERSION}/asm
+cp "${GIT_DIR}"/../../../../../arch/x86/include/uapi/asm/msr-index.h turbostat${VERSION}/asm
 tar -cvjf turbostat${VERSION}.tar.bz2 turbostat${VERSION}
 popd
 mv "$DIR/cpupower${VERSION}".tar.bz2 .
diff --git a/make_header_file_passable_from_outside.patch b/make_header_file_passable_from_outside.patch
new file mode 100644
index 0000000..c396d9f
--- /dev/null
+++ b/make_header_file_passable_from_outside.patch
@@ -0,0 +1,12 @@
+Index: turbostat-3.14/Makefile
+===================================================================
+--- turbostat-3.14.orig/Makefile
++++ turbostat-3.14/Makefile
+@@ -5,7 +5,6 @@ DESTDIR		:=
+ 
+ turbostat : turbostat.c
+ CFLAGS +=	-Wall
+-CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"'
+ 
+ %: %.c
+ 	@mkdir -p $(BUILD_OUTPUT)
diff --git a/turbostat-3.13.tar.bz2 b/turbostat-3.13.tar.bz2
deleted file mode 100644
index a32eb17..0000000
--- a/turbostat-3.13.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98aa5ffa5202cbca1836a69383d44ddba70224459bb40d2fc27ebfc6bafeef1a
-size 21380
diff --git a/turbostat-3.14.tar.bz2 b/turbostat-3.14.tar.bz2
new file mode 100644
index 0000000..12c272a
--- /dev/null
+++ b/turbostat-3.14.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25252937e79be9ce2c8f05ffad9f9502b78559df34d54d54f54c4a1d76ac8b17
+size 21870