diff --git a/systemtap-gcc43-fixes.diff b/systemtap-gcc43-fixes.diff
new file mode 100644
index 0000000..f3556c2
--- /dev/null
+++ b/systemtap-gcc43-fixes.diff
@@ -0,0 +1,21 @@
+--- staptree.h-dist	2007-10-24 16:27:33.000000000 +0200
++++ staptree.h	2007-10-24 16:27:56.000000000 +0200
+@@ -844,7 +844,7 @@ require (deep_copy_visitor* v, T* dst, T
+     }
+ }
+ 
+-template <> static void
++template <> void
+ require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
+ {
+   if (src != NULL)
+--- staptree.cxx-dist	2007-10-24 16:27:29.000000000 +0200
++++ staptree.cxx	2007-10-24 16:28:06.000000000 +0200
+@@ -17,6 +17,7 @@
+ #include <cassert>
+ #include <vector>
+ #include <algorithm>
++#include <cstring>
+ 
+ using namespace std;
+ 
diff --git a/systemtap.changes b/systemtap.changes
index 2c86a9a..e3b6d04 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 24 16:33:35 CEST 2007 - tiwai@suse.de
+
+- fix build with gcc 4.3
+
 -------------------------------------------------------------------
 Mon Oct 22 15:23:15 CEST 2007 - tiwai@suse.de
 
diff --git a/systemtap.spec b/systemtap.spec
index fb83e58..84d8202 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -15,13 +15,14 @@ BuildRequires:  gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-
 %define package_version  20071020
 License:        GPL v2 or later
 Version:        0.6
-Release:        1
+Release:        3
 Summary:        Instrumentation System
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
 # Requires: kernel-source gcc make
 # Suggest: kernel-smp-debuginfo
 Source:         ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
+Patch:          systemtap-gcc43-fixes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,6 +42,7 @@ Authors:
 %prep
 # %setup -n %{name}-%{package_version} -q -a1
 %setup -n src -q
+%patch
 
 %build
 %configure
@@ -62,6 +64,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/systemtap
 %dir %attr(0755,root,root) /var/cache/systemtap
 %changelog
+* Wed Oct 24 2007 - tiwai@suse.de
+- fix build with gcc 4.3
 * Mon Oct 22 2007 - tiwai@suse.de
 - updated to snapshot 20071020:
   * bump up version 0.6