diff --git a/rrdtool-automake.patch b/rrdtool-automake.patch
deleted file mode 100644
index 652e9b7..0000000
--- a/rrdtool-automake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: rrdtool-1.4.7/bindings/tcl/Makefile.am
-===================================================================
---- rrdtool-1.4.7.orig/bindings/tcl/Makefile.am
-+++ rrdtool-1.4.7/bindings/tcl/Makefile.am
-@@ -27,8 +27,9 @@ tclpkgdir = @TCL_PACKAGE_DIR@
- tclpkg_DATA = pkgIndex.tcl
- tclpkg_SCRIPTS = ifOctets.tcl
- else
--pkglib_DATA = pkgIndex.tcl
--pkglib_SCRIPTS = ifOctets.tcl
-+datalibdir=$(pkglibdir)
-+datalib_DATA = pkgIndex.tcl
-+datalib_SCRIPTS = ifOctets.tcl
- endif
- 
- # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
diff --git a/rrdtool-lua_lib64.patch b/rrdtool-lua_lib64.patch
index 3cb1616..342e54a 100644
--- a/rrdtool-lua_lib64.patch
+++ b/rrdtool-lua_lib64.patch
@@ -1,6 +1,21 @@
---- configure.ac.orig	2010-12-28 03:34:15.000000000 +0100
-+++ configure.ac	2010-12-28 03:34:27.000000000 +0100
-@@ -783,7 +783,7 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -29316,7 +29316,7 @@ fi
+           done
+         fi
+ 
+-        LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
++        LUA_RRD_LIBDIR="$langpref/lib64/lua/$lua_vdot"
+         # if lua 5.0 can't find compat-5.1, force installation of
+         # compat-5.1.lua together with RRDtool.
+         if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -782,7 +782,7 @@ LUA_EOF
            done
          fi
  
diff --git a/rrdtool.changes b/rrdtool.changes
index 569eba8..e29220c 100644
--- a/rrdtool.changes
+++ b/rrdtool.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jun  1 09:20:20 UTC 2013 - schwab@suse.de
+
+- Work around makefile dependencies on installed ruby headers during
+  installation
+- Avoid running autoreconf, remove rrdtool-automake.patch
+
 -------------------------------------------------------------------
 Wed May 29 11:07:08 UTC 2013 - mhrusecky@suse.com
 
diff --git a/rrdtool.spec b/rrdtool.spec
index f7232bd..5a966c1 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -51,7 +51,6 @@ Source:         http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
 Patch1:         rrdtool-lua_lib64.patch
 Patch2:         rrdtool-tclversion.patch
 Patch3:         rrdtool-tclsegfault.patch
-Patch4:         rrdtool-automake.patch
 Source1:        http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:        cgilib-fix_automake.patch
 Url:            http://oss.oetiker.ch/rrdtool/
@@ -74,7 +73,6 @@ definable time period.
 %endif
 %patch2
 %patch3
-%patch4 -p1
 pushd "cgilib-%{cgilib_version}"
 %patch11
 popd #cgilib
@@ -102,14 +100,6 @@ popd #cgilib
 if [ ! -d m4 ]; then mkdir m4; fi
 # we need getext 0.18
 #autoreconf -i -f
-%if %{_lib}==lib64
-# don't pass -i to autoreconf, that'll run autopoint which will go
-# nuts because of the supposedly outdated gettext version:
-autoreconf -fv
-%endif
-# ugly hack to fix build failure, when make looks for ruby.h in a wrong place:
-mkdir -p %{buildroot}/usr/include
-cp -R /usr/include/ruby* %{buildroot}/usr/include/ || true
 export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \
 %configure --disable-static --with-pic --enable-shared \
             --with-tcllib=%{_libdir} \
@@ -120,6 +110,8 @@ make %{?jobs:-j %jobs} V=1
 
 %install
 #eval `perl -V:installarchlib`
+# Override hdrdir and rubyhdrdir to avoid makefile dependencies on
+# installed ruby headers to be prefixed with %{buildroot}
 make \
     DESTDIR=$RPM_BUILD_ROOT \
     idocdir=%{_docdir}/%{name}/txt/ \
@@ -127,6 +119,8 @@ make \
     examplesdir=%{_docdir}/%{name}/examples/ \
     libdir=%{_libdir} \
     pkglibdir=%tcl_archdir/tclrrd%version \
+    hdrdir=%{_includedir}/ruby-2.0.0 \
+    rubyhdrdir=%{_includedir}/ruby-2.0.0 \
     install
 # we install this later again
 rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl