diff --git a/rrdtool-1.0.48-php_config.patch b/rrdtool-1.0.49-php_config.patch
similarity index 88%
rename from rrdtool-1.0.48-php_config.patch
rename to rrdtool-1.0.49-php_config.patch
index 14b7908..199ae10 100644
--- a/rrdtool-1.0.48-php_config.patch
+++ b/rrdtool-1.0.49-php_config.patch
@@ -1,10 +1,11 @@
 --- contrib/php4/php_rrdtool.h.orig	2003-06-30 10:46:50.000000000 +0200
 +++ contrib/php4/php_rrdtool.h	2004-08-25 20:15:28.172799056 +0200
-@@ -12,6 +12,8 @@
+@@ -12,6 +12,9 @@
  #ifndef _PHP4_RRDTOOL_H
  #define _PHP4_RRDTOOL_H
  
 +#include "php_config.h"
++#include "config.h"
 +
  #if COMPILE_DL_RRDTOOL
  #undef HAVE_RRDTOOL
diff --git a/rrdtool.spec b/rrdtool.spec
index 75684f5..3a54899 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -1,15 +1,14 @@
-%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4)
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.0.49
-Release: 4
-
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
-Patch: rrdtool-1.0.48-php_config.patch
+Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz
+Patch: rrdtool-1.0.49-php_config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
 BuildRequires: libpng-devel, zlib-devel
@@ -148,8 +147,11 @@ find examples/ contrib/ -type f -exec chmod 0644 {} \;
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-4
+- Fix for the php module patch (Joe Pruett, Dag Wieers), #156716.
+- Update source URL to new location since 1.2 is now the default stable.
+- Don't (yet) update to 1.0.50, as it introduces some changes in the perl
+  modules install.
 
 * Mon Jan 31 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-3
 - Put perl modules in vendor_perl and not site_perl. #146513