diff --git a/python-basemap.spec b/python-basemap.spec
index 7101200..f2527c8 100644
--- a/python-basemap.spec
+++ b/python-basemap.spec
@@ -2,7 +2,7 @@
 
 Name:           python-basemap
 Version:        0.99.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
 License:        LGPLv2+
@@ -10,7 +10,7 @@ URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.ba
 Source0:        http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tar.gz
 #Patch0:         python-basemap-0.99-setup.cfg.patch
 #Patch1:         python-basemap-0.99-setup.patch
-#Patch2:         python-basemap-0.99-datadir.patch
+Patch2:         python-basemap-0.99-datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, proj-devel, shapelib-devel, numpy-f2py, geos-devel 
@@ -26,7 +26,7 @@ projections (with continental and political boundaries).
 %setup -q -n basemap-%{version}
 #%patch0 -p0
 #%patch1 -p0
-#%patch2 -p0
+%patch2 -p0
 #Remove the bundled libraries
 #mv src/_pyproj.c src/basemap_pycompat.h .
 #rm -rf src pyshapelib/shapelib
@@ -36,7 +36,6 @@ rm -rf lib/mpl_toolkits/basemap/data/
 
 %build
 export GEOS_LIB="/usr/"
-export BASEMAPDATA="/usr/share/basemap"
 %{__python} setup.py config
 %{__python} setup.py build
 
@@ -68,6 +67,15 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/_geoslib.so
 
 %changelog
+* Thu Apr 01 2010 Jef Spaleta <jspaleta@fedoraproject.org> - 0.99.4-5
+- Rebuild to for geos soname bump and numpy 1.3 reversion. 
+
+* Thu Apr 01 2010 Jef Spaleta <jspaleta@fedoraproject.org> - 0.99.4-4
+- Added back the data directory patch. It is needed to correctly set the 
+  default location of system data files provided by the python-basemap-data 
+  package.  Setting the environment variable at build time is not sufficient 
+  to set the correct system-wide location for distribution packaging.  
+
 * Thu Apr 01 2010 Jef Spaleta <jspaleta@fedoraproject.org> - 0.99.4-3
 - Rebuild to fix numpy ABI change.