diff --git a/Zope-2.8.5-final.tgz b/Zope-2.8.5-final.tgz
deleted file mode 100644
index 4e09e85..0000000
--- a/Zope-2.8.5-final.tgz
+++ /dev/null
Binary files differ
diff --git a/Zope-2.8.7-final.tgz b/Zope-2.8.7-final.tgz
new file mode 100644
index 0000000..70543da
--- /dev/null
+++ b/Zope-2.8.7-final.tgz
Binary files differ
diff --git a/zope.spec b/zope.spec
index 0596530..4cdd03e 100644
--- a/zope.spec
+++ b/zope.spec
@@ -12,13 +12,13 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.5
+Version: 2.8.7
 Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.5/Zope-2.8.5-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
+Source0: http://zope.org/Products/Zope/2.8.7/Zope-2.8.7-final.tgz
+Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n Zope-%{version}-final #-a 10
+%setup -q -n Zope-%{version}-final -a 10
 %patch0 -p1 -b .config
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
@@ -77,7 +77,7 @@
 rm -f docs
 
 # Create all required additional directories
-for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \
+for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var,lib} \
     %{_sysconfdir}/sysconfig %{_bindir}; do
     mkdir -p $RPM_BUILD_ROOT$dir
 done
@@ -95,7 +95,7 @@
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \
     $RPM_BUILD_ROOT%{_bindir}/zopectl \
     $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \
-    README.CentOS skel/etc/zope.conf.in
+    README.CentOS skel/etc/zope.conf.in skel/lib/python/README.txt.in
 
 # Install the skel, translating paths, into the build root
 %{__python} "utilities/copyzopeskel.py" \
@@ -110,7 +110,7 @@
 make install
 
 # Hotfix
-#cp -a Hotfix_20050405 $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
+cp -a Hotfix_20060705 $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
 
 chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
@@ -167,6 +167,7 @@
 %{zope_home}/skel/bin
 %{zope_home}/skel/Extensions
 %{zope_home}/skel/import
+%{zope_home}/skel/lib
 %{zope_home}/skel/log
 %{zope_home}/skel/Products
 %{zope_home}/skel/README.txt
@@ -176,6 +177,7 @@
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
@@ -185,6 +187,9 @@
 
 
 %changelog
+* Thu Jul 13 2006 Alex Tucker <alex@floop.org.uk> - 2.8.7-1
+- Updated to 2.8.7.  Added hotfix.
+
 * Wed Jan 25 2006 Alex Tucker <alex@floop.org.uk> - 2.8.5
 - Upgraded to 2.8.5, reworked for CentOS4