diff --git a/oprofile-basename.diff b/oprofile-basename.diff
new file mode 100644
index 0000000..ece5d8c
--- /dev/null
+++ b/oprofile-basename.diff
@@ -0,0 +1,24 @@
+From: Tony Jones <tonyj@suse.de>
+Subject: Include libgen.h
+Upstream: yes
+
+Include libgen.h.  This forces C++ to use xpg definition of basename which 
+matches what libiberty expects (default is ISO C++ version in string.h)
+
+Otherwise build fails with:
+
+/usr/include/libiberty.h:105: error: new declaration char* basename(const
+char*)
+/usr/include/string.h:599: error: ambiguates old declaration const char*
+basename(const char*)
+
+--- oprofile-0.9.4/configure.in.orig	2009-04-08 13:43:42.000000000 -0400
++++ oprofile-0.9.4/configure.in	2009-04-08 13:43:45.000000000 -0400
+@@ -15,6 +15,7 @@ AC_INIT(libop/op_config.h)
+ AM_INIT_AUTOMAKE(oprofile, 0.9.4)
+ AM_CONFIG_HEADER(config.h)
+ 
++AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]])
+ AC_PROG_RANLIB
+ AC_PROG_LIBTOOL
+ 
diff --git a/oprofile.changes b/oprofile.changes
index 210c1d1..cdd44e5 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 10 20:23:19 CEST 2009 - tonyj@suse.de
+
+- Fix definition clash for basename 
+
 -------------------------------------------------------------------
 Sun Mar  1 17:17:56 CET 2009 - coolo@suse.de
 
diff --git a/oprofile.spec b/oprofile.spec
index 682300c..024e02b 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -25,13 +25,14 @@ Group:          Development/Tools/Other
 AutoReqProv:    on
 PreReq:         /usr/sbin/groupadd /usr/sbin/useradd
 Version:        0.9.4
-Release:        52
+Release:        53
 Summary:        System-Wide Profiler for Linux Systems
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        jvmpi.h
-Patch:          %{name}-%{version}.diff
+Patch1:         %{name}-%{version}.diff
+Patch2:         oprofile-basename.diff
 
 %description
 OProfile is a system-wide profiler for Linux systems, capable of
@@ -103,7 +104,8 @@ Authors:
 
 %prep
 %setup -q
-%patch
+%patch1
+%patch2 -p1
 mkdir -p java/include
 ln -s %_libdir/jvm/java/include/* java/include
 test -f java/include/jvmpi.h || ln -s %{S:2} java/include
@@ -150,6 +152,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libopagent.so
 
 %changelog
+* Wed Jun 10 2009 tonyj@suse.de
+- Fix definition clash for basename
 * Sun Mar 01 2009 coolo@suse.de
 - fix compilation with gcc 4.4
 * Thu Nov 20 2008 schwab@suse.de
@@ -263,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT
 - Folded both automake patches into one patch
 * Tue Mar 11 2003 kukuk@suse.de
 - Don't call depmod
-* Mon Mar 10 2003 ro@suse.de
+* Tue Mar 11 2003 ro@suse.de
 - remove k_deflt from neededforbuild (cycle)
 * Mon Mar 10 2003 mmj@suse.de
 - Fix typo