diff --git a/.cvsignore b/.cvsignore
index 30e79f7..bddcc87 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-myspell-xh_ZA-20060123.zip
+dict-xh_ZA-2009.10.30.oxt
diff --git a/hunspell-xh.spec b/hunspell-xh.spec
index 449e0fc..3abc384 100644
--- a/hunspell-xh.spec
+++ b/hunspell-xh.spec
@@ -1,9 +1,9 @@
 Name: hunspell-xh
 Summary: Xhosa hunspell dictionaries
-%define upstreamid 20060123
+%define upstreamid 20091030
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
-Source: http://downloads.translate.org.za/spellchecker/xhosa/myspell-xh_ZA-%{upstreamid}.zip
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/e-files/3133/0/dict-xh_ZA-2009.10.30.oxt
 Group: Applications/Text
 URL: http://www.translate.org.za/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,16 @@ Xhosa hunspell dictionaries.
 %setup -q -c -n hunspell-xh
 
 %build
+for i in README-xh_ZA.txt release-notes-xh_ZA.txt package-description.txt; do
+  if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
+    iconv -f ISO-8859-2 -t UTF-8 $i > $i.new
+    touch -r $i $i.new
+    mv -f $i.new $i
+  fi
+  tr -d '\r' < $i > $i.new
+  touch -r $i $i.new
+  mv -f $i.new $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -30,10 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_xh_ZA.txt
+%doc README-xh_ZA.txt release-notes-xh_ZA.txt package-description.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Sat Feb 06 2010 Caolan McNamara <caolanm@redhat.com> - 0.20091030-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20060123-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 28a5ec0..deb057a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7d2f996475c4cbdb16b99272efbd90b  myspell-xh_ZA-20060123.zip
+e147831f844c71ca54b65bae34ddd40c  dict-xh_ZA-2009.10.30.oxt