diff --git a/.cvsignore b/.cvsignore
index 83c4787..02611f1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cacti-0.8.6j.tar.gz
+cacti-0.8.7.tar.gz
diff --git a/cacti.spec b/cacti.spec
index 59ab5f5..bf75293 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6j
-Release: 10%{?dist}
+Version: 0.8.7
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,14 +11,6 @@ Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: CVE-2007-3112.patch
-Patch3: ping_php_version4_snmpgetnext.patch
-Patch4: tree_console_missing_hosts.patch
-Patch5: thumbnail_graphs_not_working.patch
-Patch6: graph_debug_lockup_fix.patch
-Patch7: snmpwalk_fix.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -37,13 +29,6 @@ used to creating traffic graphs with MRTG.
 
 %prep
 %setup -q
-%patch1 -p0
-%patch2 -p3
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -64,9 +49,9 @@ rm -rf %{buildroot}
 %{__cp} -a images/ include/ install/ lib/ resource/ %{buildroot}%{_datadir}/%{name}
 %{__cp} %{SOURCE3} ./docs/README.cacti
 %{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version}
-%{__mv} %{buildroot}/%{_datadir}/%{name}/include/db.php %{buildroot}/%{_sysconfdir}/%{name}/db.php
+%{__mv} %{buildroot}/%{_datadir}/%{name}/include/config.php %{buildroot}/%{_sysconfdir}/%{name}/db.php
 %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/cmd.php %{buildroot}/%{_datadir}/%{name}/poller.php
-ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/db.php
+ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/config.php
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
@@ -115,11 +100,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Wed Sep 26 2007 Mike McGrath <mmcgrath@redhat.com> - 0.8.6j-10
-- Rebuild for koji test
-
-* Fri Sep 21 2007 Mike McGrath <mmcgrath@redhat.com> - 0.8.6j-9
-- Added rest of official patches
+* Fri Oct 13 2007 Mike McGrath <mmcgrath@redhat.com> - 0.8.7-1
+- Upstream released new version
+- No longer need to patch for /etc/cacti/*
 
 * Fri Sep 14 2007 Mike McGrath <mmcgrath@redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
diff --git a/sources b/sources
index 2979952..57cb59e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29436be46b289d13dfce48e7618129e2  cacti-0.8.6j.tar.gz
+d28e8f9fd4b657c2ad79c4bcf1e3694d  cacti-0.8.7.tar.gz