diff --git a/systemtap-extend-blacklist.diff b/systemtap-extend-blacklist.diff
new file mode 100644
index 0000000..79467ac
--- /dev/null
+++ b/systemtap-extend-blacklist.diff
@@ -0,0 +1,40 @@
+From 275a898f43b2e6f7a55112fce91cbeb8a32f99ac Mon Sep 17 00:00:00 2001
+From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
+Date: Thu, 12 Feb 2009 20:00:27 +0530
+Subject: [PATCH] Extend blacklist to cover bitops.h. While there, fixup paths for existing blacklisted files
+
+---
+ tapsets.cxx |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+Index: src/tapsets.cxx
+===================================================================
+--- src.orig/tapsets.cxx
++++ src/tapsets.cxx
+@@ -2937,6 +2937,13 @@ dwarf_query::build_blacklist()
+ 
+   blfile += "kernel/kprobes.c"; // first alternative, no "|"
+   blfile += "|arch/.*/kernel/kprobes.c";
++  // Older kernels need ...
++  blfile += "|include/asm/io.h";
++  blfile += "|include/asm/bitops.h";
++  // While newer ones need ...
++  blfile += "|arch/.*/include/asm/io.h";
++  blfile += "|arch/.*/include/asm/bitops.h";
++  blfile += "|drivers/ide/ide-iops.c";
+ 
+   // XXX: it would be nice if these blacklisted functions were pulled
+   // in dynamically, instead of being statically defined here.
+Index: src/testsuite/systemtap.examples/profiling/functioncallcount.stp
+===================================================================
+--- src.orig/testsuite/systemtap.examples/profiling/functioncallcount.stp
++++ src/testsuite/systemtap.examples/profiling/functioncallcount.stp
+@@ -3,7 +3,7 @@
+ #
+ # stap  functioncallcount.stp "*@mm/*.c"
+ 
+-probe kernel.function(@1) {  # probe functions listed on commandline
++probe kernel.function(@1).call {  # probe functions listed on commandline
+   called[probefunc()] <<< 1  # add a count efficiently
+ }
+ 
diff --git a/systemtap.changes b/systemtap.changes
index 5aae950..9f0c395 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 12 16:32:29 CET 2009 - tiwai@suse.de
+
+- backport the blacklist additions from upstream to fix possible
+  system crash (bnc#459387, bnc#473277)
+
 -------------------------------------------------------------------
 Thu Feb  5 13:31:19 CET 2009 - tiwai@suse.de
 
diff --git a/systemtap.spec b/systemtap.spec
index cd2ba19..739869c 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -25,7 +25,7 @@ BuildRequires:  latex2html
 %define package_version  20080906
 License:        GPL v2 or later
 Version:        0.7.1
-Release:        39
+Release:        40
 Summary:        Instrumentation System
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
@@ -47,6 +47,7 @@ Patch12:        stap-fix-procfs-dir_entry-count.diff
 Patch13:        stap-pr6905-weaken-lineno-checks.diff
 Patch14:        systemtap-debugpath.exp-path-fix.diff
 Patch15:        systemtap-signal-stp-fixes.diff
+Patch16:        systemtap-extend-blacklist.diff
 Requires:       libebl1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -82,6 +83,7 @@ Authors:
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 autoreconf -fi
@@ -110,6 +112,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %attr(0755,root,root) /var/cache/systemtap
 
 %changelog
+* Thu Feb 12 2009 tiwai@suse.de
+- backport the blacklist additions from upstream to fix possible
+  system crash (bnc#459387, bnc#473277)
 * Thu Feb 05 2009 tiwai@suse.de
 - Backport tapset/signal.stp to fix the signal probe problem
   (bnc#468321)