diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..88cf270
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+rpm:
+	cd src/DocumentLibrary; \
+	svn diff -r 205 > ../../index.patch; \
+	cd -; \
+	rpmbuild -ba documentlibrary.spec
diff --git a/documentlibrary.spec b/documentlibrary.spec
index 6d7001c..7631f47 100644
--- a/documentlibrary.spec
+++ b/documentlibrary.spec
@@ -1,10 +1,10 @@
 Summary: 	A Zope product used to create full-text searchable and browsable document libraries
 Name: 		DocumentLibrary
 Version: 	1.0rc1
-Release: 	2
+Release: 	3
 URL: 		http://www.zope.org/Members/Kaivo/%{name}
 Source0: 	http://www.zope.org/Members/Kaivo/%{name}/%{name}-%{version}.tgz
-Patch0:		fix_lexicon.patch
+Patch0:		index.patch
 License: 	http://www.zope.org/Members/Kaivo/DocumentLibrary/License
 Group: 		Development/Web Applications
 BuildRoot: 	%{_tmppath}/%{name}-root
@@ -18,7 +18,7 @@
 
 %prep
 %setup -n %{name}
-%patch -p 1
+%patch
 
 %build
 
@@ -38,6 +38,9 @@
 /usr/share/zope/lib/python/Products/%{name}
 
 %changelog
+* Thu Dec 18 2003 Alex Tucker <alex@floop.org.uk>
+- Updated to CVS head and forced use of UnicodeSplitter.
+
 * Thu Jun 12 2003 Alex Tucker <alex@floop.org.uk>
 - Fixed problems with using old Catalog interface with lexicons
 
diff --git a/fix_lexicon.patch b/fix_lexicon.patch
deleted file mode 100644
index b855849..0000000
--- a/fix_lexicon.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr DocumentLibrary-1.0rc1-orig/CatalogPlus.py DocumentLibrary-1.0rc1/CatalogPlus.py
---- DocumentLibrary-1.0rc1-orig/CatalogPlus.py	2002-01-18 04:38:36.000000000 +0000
-+++ DocumentLibrary-1.0rc1/CatalogPlus.py	2003-06-12 10:03:13.000000000 +0100
-@@ -152,6 +152,7 @@
-         self.uncatalogObject(uid)
- 
-     def getLexicon(self):
-+        return None
-         lexicon = self.lexicon
- 
-         if type(lexicon) == type(''):
-diff -uNr DocumentLibrary-1.0rc1-orig/DocumentStore.py DocumentLibrary-1.0rc1/DocumentStore.py
---- DocumentLibrary-1.0rc1-orig/DocumentStore.py	2002-01-18 04:38:37.000000000 +0000
-+++ DocumentLibrary-1.0rc1/DocumentStore.py	2003-06-12 10:03:03.000000000 +0100
-@@ -146,7 +146,7 @@
- 
-         for name, index_class in self._defaultCatalogIndexes:
-             if index_class is TextIndex:
--                self.Catalog.addIndex(name, index_class(name, lexicon=lexicon))
-+                self.Catalog.addIndex(name, index_class(name))
-             else:
-                 self.Catalog.addIndex(name, index_class(name))
- 
-@@ -452,7 +452,7 @@
- 
-         if index_class is TextIndex:
-             self.Catalog.addIndex(name, 
--                                  index_class(name, lexicon=self.Catalog.getLexicon()))
-+                                  index_class(name))
-         else:
-             self.Catalog.addIndex(name, index_class(name))
-