diff --git a/elfutils-0.148-dont-crash.diff b/elfutils-0.148-dont-crash.diff
new file mode 100644
index 0000000..5952ea9
--- /dev/null
+++ b/elfutils-0.148-dont-crash.diff
@@ -0,0 +1,17 @@
+From: Stephan Kulow <coolo@novell.com>
+
+Avoid crash if the header is 0
+
+Index: elfutils-0.148/libdw/dwarf_getcfi_elf.c
+===================================================================
+--- elfutils-0.148.orig/libdw/dwarf_getcfi_elf.c	2010-01-12 17:57:54.000000000 +0100
++++ elfutils-0.148/libdw/dwarf_getcfi_elf.c	2010-09-13 12:51:04.299807382 +0200
+@@ -97,7 +97,7 @@ parse_eh_frame_hdr (const uint8_t *hdr,
+ {
+   const uint8_t *h = hdr;
+ 
+-  if (*h++ != 1)		/* version */
++  if (!h || *h++ != 1)		/* version */
+     return (void *) -1l;
+ 
+   uint8_t eh_frame_ptr_encoding = *h++;
diff --git a/elfutils.changes b/elfutils.changes
index e85f671..b5e788f 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 13 11:32:58 UTC 2010 - coolo@novell.com
+
+- add small patch to avoid crash in systemtap while building preload
+
 -------------------------------------------------------------------
 Thu Aug 26 03:32:26 CEST 2010 - tonyj@suse.de
 
diff --git a/elfutils.spec b/elfutils.spec
index ee3df43..90f7366 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -33,6 +33,7 @@ Patch3:         elfutils-no-po-test-build.diff
 Patch4:         libebl-prototype-fix.diff
 Patch5:         elfutils-uninitialized.diff
 Patch6:         elfutils-0.137-dwarf-header-check-fix.diff
+Patch7:         elfutils-0.148-dont-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison flex
 
@@ -140,6 +141,7 @@ to develop applications that require these.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 autoreconf -fi