diff --git a/oprofile-0.9.7-watchdog.diff b/oprofile-0.9.7-watchdog.diff
new file mode 100644
index 0000000..d19804f
--- /dev/null
+++ b/oprofile-0.9.7-watchdog.diff
@@ -0,0 +1,17 @@
+diff -wur oprofile-0.9.7/utils/opcontrol oprofile-0.9.7-nu/utils/opcontrol
+--- oprofile-0.9.7/utils/opcontrol	2011-07-20 16:36:48.000000000 -0300
++++ oprofile-0.9.7-nu/utils/opcontrol	2011-12-24 11:36:16.141000284 -0300
+@@ -1211,10 +1211,10 @@
+ 			echo $3 >$MOUNT/$1/$2
+ 		else
+ 			echo -n "Error: counter $1 not available"
+-			if test -e /proc/sys/kernel/nmi_watchdog; then
+-				echo " nmi_watchdog using this resource ? Try:"
++			if test -e /proc/sys/kernel/watchdog; then
++				echo " watchdog using this resource ? Try:"
+ 				echo "opcontrol --deinit"
+-				echo "echo 0 > /proc/sys/kernel/nmi_watchdog"
++				echo "echo 0 > /proc/sys/kernel/watchdog"
+ 			fi
+ 			exit 1
+ 		fi
diff --git a/oprofile.changes b/oprofile.changes
index c3c2466..9d26eae 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 27 14:38:40 UTC 2011 - klaussfreire@gmail.com
+
+- Fix nmi_watchdog handling, it was renamed as watchdog in recent 
+  kernels [#684751]
+
 -------------------------------------------------------------------
 Fri Nov 25 10:42:15 UTC 2011 - coolo@suse.com
 
diff --git a/oprofile.spec b/oprofile.spec
index 9610515..d5fc248 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -35,6 +35,7 @@ Source4:        jvmpi.h
 Source5:        README-BEFORE-ADDING-PATCHES
 Patch1:         oprofile-0.9.5-buildfixes.diff
 Patch2:         oprofile-0.9.4-fixes.diff
+Patch3:         oprofile-0.9.7-watchdog.diff
 
 %description
 OProfile is a system-wide profiler for Linux systems, capable of
@@ -90,6 +91,7 @@ from supported virtual machines.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 mkdir -p java/include
 # copy files necessary to build Java agent libraries
 # libjvmpi_oprofile.so and libjvmti_oprofile.so