diff --git a/.cvsignore b/.cvsignore
index 13a721b..f086e72 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 cacti-0.8.6h.tar.gz
+cacti-0.8.6i.tar.gz
diff --git a/cacti.spec b/cacti.spec
index 6980983..0080491 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6h
-Release: 7%{?dist}
+Version: 0.8.6i
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -10,6 +10,9 @@ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+
+Patch1: cacti-0.8.6h-dbcfg.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -17,12 +20,6 @@ Requires(pre): %{_sbindir}/useradd
 Requires(postun): /sbin/service 
 BuildArch: noarch
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the
 necessary information to create graphs and populate them with
@@ -35,10 +32,6 @@ used to creating traffic graphs with MRTG.
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -51,7 +44,7 @@ rm -rf %{buildroot}
 %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
-%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
@@ -65,6 +58,8 @@ ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/db.
 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
+ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/
+ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/
 
 %clean
 rm -rf %{buildroot}
@@ -104,8 +99,13 @@ fi
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath <imlinux@gmail.com> - 0.8.6i-2
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath <imlinux@gmail.com> - 0.8.6h-7
 - Mass rebuild
 
diff --git a/sources b/sources
index 93420f7..2d9aed6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
+341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz