diff --git a/.cvsignore b/.cvsignore
index b5983a5..9b20150 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1 @@
-mapnik-0.6.1.tar.bz2
 mapnik-build-viewer.patch
-mapnik.spec
-mapnik-freetype.patch
-no_date_footer.html
-viewer.desktop
-mapnik-data.license
diff --git a/mapnik.spec b/mapnik.spec
index 4336887..c3a71d2 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,6 +1,6 @@
 Name:      mapnik
-Version:   0.6.1
-Release:   5%{?dist}
+Version:   0.7.0
+Release:   1%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -103,7 +103,7 @@ spatial visualization library
 %setup -q -n %{name}-%{version}
 
 %patch0 -p0
-%patch1 -p0
+#patch1 -p0
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -267,6 +267,11 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
+* Sun Jan 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.7.0-1
+- Update to 0.7.0
+- Rebase mapnik-build-viewer patch against 0.7.0
+- aggdepends patch no longer seems necessary
+
 * Sat Jan 16 2010 Stepan Kasal <skasal@redhat.com> - 0.6.1-5
 - rebuild against new boost
 
diff --git a/sources b/sources
index 31338ba..2ddab5b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-44093af694321ef2034b1fd2edc998c9  mapnik-0.6.1.tar.bz2
-be169250b3c63161cc9f679883eb9863  mapnik-build-viewer.patch
+fcb6afc460edea92e063201ffeb471d8  mapnik-0.7.0.tar.bz2
+2b5173028820336977dcf19bec2d72e0  mapnik-build-viewer.patch
 3ae4e10b33cc68cd548f29deb7b8b7de  mapnik.spec
 7bf5cf2dc1ef6c907a7e89fca6b8f84e  mapnik-freetype.patch
 7c87cbae93e72e80516cea82251a5662  no_date_footer.html