diff --git a/mapnik-rpath.patch b/mapnik-rpath.patch
new file mode 100644
index 0000000..eb0ad33
--- /dev/null
+++ b/mapnik-rpath.patch
@@ -0,0 +1,21 @@
+commit fbbe37d3c9c956a39f3733744a805a37b5b19c3d
+Author: Tom Hughes <tom@compton.nu>
+Date:   Tue Jan 26 09:43:05 2016 +0000
+
+    Don't set rpath
+
+diff --git a/src/build.py b/src/build.py
+index bdc3438..cc93386 100644
+--- a/src/build.py
++++ b/src/build.py
+@@ -141,10 +141,6 @@ else: # unix, non-macos
+         mapnik_lib_link_flag += ' -Wl,-rpath-link,.'
+         if env['ENABLE_SONAME']:
+             mapnik_lib_link_flag += ' -Wl,-soname,%s' % mapnik_libname
+-        if env['FULL_LIB_PATH']:
+-            mapnik_lib_link_flag += ' -Wl,-rpath=%s' % env['MAPNIK_LIB_BASE']
+-        else:
+-            mapnik_lib_link_flag += ' -Wl,-z,origin -Wl,-rpath=\$$ORIGIN'
+ 
+ source = Split(
+     """
diff --git a/mapnik.spec b/mapnik.spec
index 69f01cb..71adacb 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   3.0.9
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -9,13 +9,15 @@ Source0:   http://s3.amazonaws.com/mapnik/dist/v%{version}/mapnik-v%{version}.ta
 Source1:   mapnik-data.license
 Source2:   viewer.desktop
 # Allow the viewer to be built against uninstalled libraries
-Patch0:	   mapnik-build-viewer.patch
+Patch0:    mapnik-build-viewer.patch
 # Build against the system version of sparsehash
-Patch1:	   mapnik-system-sparsehash.patch
+Patch1:    mapnik-system-sparsehash.patch
 # Allow some minor differences in the visual tests
-Patch2:	   mapnik-visual-compare.patch
+Patch2:    mapnik-visual-compare.patch
 # Patch tests for changes in boost 1.60
-Patch3:	   mapnik-boost.patch
+Patch3:    mapnik-boost.patch
+# Patch out attempt to set rpath
+Patch4:    mapnik-rpath.patch
 
 Requires: dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lgc-serif-fonts dejavu-lgc-sans-fonts dejavu-lgc-sans-mono-fonts
 Requires: proj-epsg
@@ -64,7 +66,7 @@ industry standard libraries from boost.org
 %package devel
 Summary: Mapnik is a Free toolkit for developing mapping applications
 Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: proj-devel
 Requires: boost-devel libicu-devel
 Requires: libtiff-devel libjpeg-devel libpng-devel libwebp-devel
@@ -91,7 +93,7 @@ industry standard libraries from boost.org
 %package static
 Summary: Static libraries for the Mapnik spatial visualization library
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description static
 Static libraries for the Mapnik spatial visualization library.
@@ -101,7 +103,7 @@ Static libraries for the Mapnik spatial visualization library.
 License:  GPLv2+
 Summary:  Utilities distributed with the Mapnik spatial visualization library
 Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description utils
 Miscellaneous utilities distributed with the Mapnik spatial visualization
@@ -121,17 +123,9 @@ spatial visualization library.
 
 
 %prep
-
-# unpack source
-%setup -q -n mapnik-v%{version}
-
-# apply patches
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# remove bundled sparsehash
+%autosetup -p 1 -n mapnik-v%{version}
+chmod a-x deps/agg/include/agg_rasterizer_*_aa.h
+iconv -f iso8859-1 -t utf-8 demo/data/COPYRIGHT.txt > COPYRIGHT.conv && mv -f COPYRIGHT.conv demo/data/COPYRIGHT.txt
 rm -rf deps/mapnik/sparsehash
 
 
@@ -144,9 +138,10 @@ sed -i -e "s|-O\%s |-O\%s $RPM_OPT_FLAGS |g" SConstruct
 scons configure DESTDIR=%{buildroot} \
                 PREFIX=%{_prefix} \
                 FULL_LIB_PATH=False \
-	        SYSTEM_FONTS=%{_datadir}/fonts \
+                SYSTEM_FONTS=%{_datadir}/fonts \
                 LIBDIR_SCHEMA=%{_lib} \
                 SVG2PNG=True \
+                DEMO=False \
                 XMLPARSER=libxml2 \
                 INPUT_PLUGINS=csv,gdal,geojson,ogr,pgraster,postgis,raster,shape,sqlite,topojson
 
@@ -208,6 +203,7 @@ PGHOST="$PWD" LANG="en_US.utf8" make test
 # stop our postgres instance
 pg_ctl stop -D pg_data
 
+
 %post -p /sbin/ldconfig
 
 
@@ -215,32 +211,28 @@ pg_ctl stop -D pg_data
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS.md CHANGELOG.md README.md
 %license COPYING
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/input
-%{_bindir}/mapnik-config
 %{_libdir}/%{name}/input/*.input
 %{_libdir}/lib%{name}*.so.*
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc docs/
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}*.so
 %{_datadir}/pkgconfig/%{name}.pc
+%{_bindir}/mapnik-config
 
 
 %files static
-%defattr(-,root,root,-)
 %{_libdir}/lib%{name}*.a
 
 
 %files utils
-%defattr(-,root,root,-)
 %{_bindir}/mapnik-index
 %{_bindir}/mapnik-render
 %{_bindir}/shapeindex
@@ -250,7 +242,6 @@ pg_ctl stop -D pg_data
 
 
 %files demo
-%defattr(-,root,root,-)
 %doc demo/c++
 %doc demo/data
 %doc demo/python
@@ -259,6 +250,9 @@ pg_ctl stop -D pg_data
 
 
 %changelog
+* Tue Jan 26 2016 Tom Hughes <tom@compton.nu> - 3.0.9-9
+- Remove %%defattr and fix various rpmlint issues
+
 * Fri Jan 22 2016 Tom Hughes <tom@compton.nu> - 3.0.9-8
 - Rebuild for boost 1.60.0