diff --git a/malaga-suomi.changes b/malaga-suomi.changes
index 7e7762e..f130260 100644
--- a/malaga-suomi.changes
+++ b/malaga-suomi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 25 16:25:17 UTC 2017 - tchvatal@suse.com
+
+- Version update to 2.1
+  * Switches from malaga to libvoikko completely
+
 -------------------------------------------------------------------
 Tue Nov 24 17:22:23 UTC 2015 - p.drouand@gmail.com
 
diff --git a/malaga-suomi.spec b/malaga-suomi.spec
index 93e517a..1691c0b 100644
--- a/malaga-suomi.spec
+++ b/malaga-suomi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package malaga-suomi
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,30 @@
 #
 
 
-%define _name suomi-malaga
+%define _name voikko-fi
+%define _altname suomi-malaga
 Name:           malaga-suomi
-Version:        1.19
+Version:        2.1
 Release:        0
 Summary:        Description of Finnish Morphology Written in Malaga
 License:        GPL-2.0+
 Group:          Productivity/Text/Spell
 Url:            http://voikko.puimula.org/
 Source:         http://www.puimula.org/voikko-sources/%{_name}/%{_name}-%{version}.tar.gz
-BuildRequires:  malaga
-BuildRequires:  python-xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  foma
+BuildRequires:  python3
+BuildRequires:  voikkospell >= 4.0
+Provides:       %{_name} = %{version}
+Obsoletes:      %{_name} < %{version}
+Provides:       %{_altname} = %{version}
+Obsoletes:      %{_altname} < %{version}
 BuildArch:      noarch
 
 %description
-Suomi-Malaga is a description of Finnish morphology written in Malaga.
+This package contains a compiled version of Voikko-fi using the new
+unweighted VFST dictionary format. It is suitable for use in spell checking,
+grammar checking and hyphenation system Voikko, provided by the libvoikko
+library.
 
 %prep
 %setup -q -n %{_name}-%{version}
@@ -39,17 +47,15 @@ Suomi-Malaga is a description of Finnish morphology written in Malaga.
 %build
 CFLAGS="%{optflags}" \
 CXXFLAGS="%{optflags}" \
-make voikko %{?_smp_mflags}
+make %{?_smp_mflags} vvfst EXTRA_LEX=vocabulary/erikoisalat/linux-distributions.lex
 
 %install
-make voikko-install DESTDIR=%{buildroot}%{_datadir}/malaga/1/mor-standard
-# compat symlinks
-cd %{buildroot}%{_datadir}/malaga
-ln -s -t. 1/mor-standard/*
+make vvfst-install DESTDIR=%{buildroot}%{_datadir}/voikko
 
 %files
 %defattr(-,root,root)
 %doc CONTRIBUTORS COPYING ChangeLog README README.fi
-%{_datadir}/malaga/*
+%dir %{_datadir}/voikko/
+%{_datadir}/voikko/*
 
 %changelog
diff --git a/suomi-malaga-1.19.tar.gz b/suomi-malaga-1.19.tar.gz
deleted file mode 100644
index 09460d7..0000000
--- a/suomi-malaga-1.19.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c4c15dd87a82e9b8ab74f9c570c6db011e3fd824db4de47ffeb71c4261451cc
-size 972762
diff --git a/voikko-fi-2.1.tar.gz b/voikko-fi-2.1.tar.gz
new file mode 100644
index 0000000..231a51c
--- /dev/null
+++ b/voikko-fi-2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71a823120a35ade6f20eaa7d00db27ec7355aa46a45a5b1a4a1f687a42134496
+size 984857