diff --git a/.cvsignore b/.cvsignore
index 0f716a6..ef1b87d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ru_RU.zip
+rus-myspell-0.99f7.tar.gz
diff --git a/hunspell-ru.spec b/hunspell-ru.spec
index 4bd034f..a6cbf67 100644
--- a/hunspell-ru.spec
+++ b/hunspell-ru.spec
@@ -1,11 +1,11 @@
 Name: hunspell-ru
 Summary: Russian hunspell dictionaries
-%define upstreamid 20040406
-Version: 0.%{upstreamid}
+Version: 0.99f7
 Release: 1%{?dist}
-Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ru_RU.zip
+Epoch: 1
+Source: ftp://ftp.vsu.ru/mirrors/scon155.phys.msu.su/pub/russian/ispell/myspell/rus-myspell-%{version}.tar.gz
 Group: Applications/Text
-URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/
+URL: ftp://scon155.phys.msu.su/pub/russian/ispell/myspell
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: BSD
 BuildArch: noarch
@@ -24,16 +24,21 @@ chmod -x *
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cp -p ru_myspell.dict $RPM_BUILD_ROOT/%{_datadir}/myspell/ru_RU.dic
+cp -p ru_RU.koi8r.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/ru_RU.aff
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_ru_RU.txt
+%doc LICENSE readme.koi
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Aug 21 2007 Caolan McNamara <caolanm@redhat.com> - 1:0.99f7-1
+- clarify licence
+- canonical upstream source
+
 * Thu Dec 07 2006 Caolan McNamara <caolanm@redhat.com> - 0.20040406-1
 - initial version
diff --git a/sources b/sources
index 21afbd4..9cf1355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67da1e4d594de554a9184568235ab301  ru_RU.zip
+05a7c3a7bea2432410a35d93161b4c0a  rus-myspell-0.99f7.tar.gz