diff --git a/CMFCollector.0.93.tgz b/CMFCollector.0.93.tgz
new file mode 100644
index 0000000..db45b22
--- /dev/null
+++ b/CMFCollector.0.93.tgz
Binary files differ
diff --git a/CMFCollector.tar.gz b/CMFCollector.tar.gz
deleted file mode 100644
index e67a01a..0000000
--- a/CMFCollector.tar.gz
+++ /dev/null
Binary files differ
diff --git a/cmfcollector.spec b/cmfcollector.spec
index 51db291..cb34225 100644
--- a/cmfcollector.spec
+++ b/cmfcollector.spec
@@ -1,15 +1,18 @@
-Summary: 	A Zope/CMF-based bug-tracking system
+%define zope_minver 2.7
+
+%define zope_home      %{_libdir}/zope
+%define software_home  %{zope_home}/lib/python
+
 Name: 		CMFCollector
-Version: 	0.9b
-Release: 	1
+Version: 	0.93
+Release: 	2
+Summary: 	A Zope/CMF-based bug-tracking system
 URL: 		http://cvs.zope.org/CMF/CMFCollector/
-Source0: 	http://cvs.zope.org/CMF/CMFCollector/CMFCollector.tar.gz
-Patch:		action-string.patch
+Source0: 	http://www.zope.org/Members/bowerymarc/CMFCollector-update/%{version}/CMFCollector.%{version}.tgz
 License: 	ZPL
 Group: 		Development/Web Applications
-BuildRoot: 	%{_tmppath}/%{name}-root
-Packager:	Alex Tucker <alex@floop.org.uk>
-Requires:	Zope-webserver >= 2.6, CMFPlone
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	plone
 
 %description
 The CMFCollector is starting out as a rudimentary issue tracker, to
@@ -19,27 +22,39 @@
 
 %prep
 %setup -n %{name}
-%patch -p 1
-
-%build
+# Clean up sources
+find . -type d -name CVS | xargs rm -rf
+find . -type f -name .cvsignore | xargs rm -rf
+find . -type d -name .svn | xargs rm -rf
+find . -type f -name "*~" | xargs rm -rf
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/%{name}
-
-cp -Rdp *			$RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/%{name}/
-
+mkdir -p $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector
+cp -pr * $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector/CHANGELOG.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector/INSTALL.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector/KNOWN_PROBLEMS.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector/README.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector/RELEASE_NOTES.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollector/TODO.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-/usr/share/zope/lib/python/Products/%{name}
+%defattr(644,root,root,755)
+%doc CHANGELOG.txt INSTALL.txt KNOWN_PROBLEMS.txt README.txt RELEASE_NOTES.txt TODO.txt
+%{software_home}/Products/*
 
 %changelog
+* Wed Jan 25 2006 Alex Tucker <alex@ferrari.floop.org.uk> - 0.93-2
+- Updated for new Plone/Zope builds.
+
+* Wed Feb 23 2005 Alex Tucker <alex@fester.floop.org.uk> - 0.93-1
+- Updated to 0.93
+
 * Thu Nov 13 2003 Alex Tucker <alex@floop.org.uk>
 - Initial build, with patch to remove "string:${object_url}" from actions for Plone.
 
-