diff --git a/.cvsignore b/.cvsignore
index 53a3be1..eabfdb6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sv-1.39.zip
+ooo_swedish_dict_1.40.oxt
diff --git a/hunspell-sv.spec b/hunspell-sv.spec
index 8ad8d07..7d4f02f 100644
--- a/hunspell-sv.spec
+++ b/hunspell-sv.spec
@@ -1,8 +1,8 @@
 Name: hunspell-sv
 Summary: Swedish hunspell dictionaries
-Version: 1.39
-Release: 2%{?dist}
-Source: http://hem.bredband.net/dsso1/sv-%{version}.zip
+Version: 1.40
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/files/1080/5/ooo_swedish_dict_%{version}.oxt
 Group: Applications/Text
 URL: http://dsso.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,12 +18,22 @@ Swedish hunspell dictionaries.
 %setup -q -c -n hunspell-sv
 
 %build
+for i in LICENSE_sv_SE.txt LICENSE_en_US.txt; do
+  if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
+    iconv -f ISO-8859-1 -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
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
-
+cp -p dictionaries/*.dic dictionaries/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
 sv_SE_aliases="sv_FI"
 for lang in $sv_SE_aliases; do
@@ -37,11 +47,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_sv_SE.txt
-
+%doc LICENSE_sv_SE.txt LICENSE_en_US.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Nov 03 2009 Caolan McNamara <caolanm@redhat.com> - 1.40-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.39-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 01262af..48e8707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5088322914dec4870ce5547caf9dc4ef  sv-1.39.zip
+913063a69b75dba8c3002dcd98e33432  ooo_swedish_dict_1.40.oxt