diff --git a/libreoffice-voikko-4.0.tar.gz b/libreoffice-voikko-4.0.tar.gz
new file mode 100644
index 0000000..1674285
--- /dev/null
+++ b/libreoffice-voikko-4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38dfdc2c299c9e538febde12b08a4544d1dd6b1da82e0f682f7457bd0975c89d
+size 36453
diff --git a/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff b/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
deleted file mode 100644
index 15c84ca..0000000
--- a/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libreoffice-voikko-rel-3.4.1/Makefile
-===================================================================
---- libreoffice-voikko-rel-3.4.1.orig/Makefile
-+++ libreoffice-voikko-rel-3.4.1/Makefile
-@@ -236,7 +236,7 @@ $(patsubst %,build/oxt/%,$(STANDALONE_EX
- # Type library C++ headers
- build/hpp.flag:
- 	-$(MKDIR) build$(PS)hpp
--	$(CPPUMAKER) -Gc -BUCR -O./build/hpp $(URE_TYPES) $(OFFICE_TYPES)
-+	$(CPPUMAKER) -Gc -O./build/hpp $(URE_TYPES) $(OFFICE_TYPES)
- 	echo flagged > $@
- 
- 
diff --git a/libreoffice-voikko-rel-3.4.1.tar.bz2 b/libreoffice-voikko-rel-3.4.1.tar.bz2
deleted file mode 100644
index 236ae7f..0000000
--- a/libreoffice-voikko-rel-3.4.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c342a93550b2e2d4734190bd4a130aa8bdf68987e941d57e15e203a67cc2568
-size 45640
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index 710ec4b..f952623 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan 26 10:22:23 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 3.7:
+  * Needed to build with lo-4.2 and later
+  * Also compatible with new libvoikko
+- Cleanup with spec-cleaner and remove useless defines.
+
 -------------------------------------------------------------------
 Thu Aug 22 15:28:03 UTC 2013 - pmladek@suse.com
 
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 41692c2..2257c77 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-voikko
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           libreoffice-voikko
-Version:        3.4.1
+Version:        4.0
 Release:        0
 Summary:        LibreOffice spellchecker/hyphenator for finnish language
 License:        GPL-3.0+
 Group:          Productivity/Text/Spell
-%define         ooo_prefix         %{_libdir}
-%define         ooo_home           libreoffice
+Url:            http://voikko.puimula.org/
+Source:         http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz
 BuildRequires:  gcc-c++
 BuildRequires:  java-devel
 BuildRequires:  libreoffice >= 4.1
@@ -31,30 +31,13 @@ BuildRequires:  libreoffice-sdk >= 4.1
 BuildRequires:  libvoikko-devel
 BuildRequires:  unzip
 BuildRequires:  zip
-# post install scripts
-%if 0%{?suse_version} > 01120
-Requires(post):   coreutils
-Requires(post):   grep
-Requires(post):   libreoffice >= 3.5
+Requires(post): coreutils
+Requires(post): grep
+Requires(post): libreoffice >= 4.1
 Requires(postun): coreutils
 Requires(postun): grep
-Requires(postun): libreoffice >= 3.5
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 01120
-PreReq:         coreutils
-PreReq:         grep
-PreReq:         libreoffice
-%endif
-Url:            http://voikko.sourceforge.net
-Source:         %{name}-rel-%{version}.tar.bz2
-# -BUCR is gone in cppumaker upstream, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=02a8e8acd1f0cbb512868fd9849363f9d069db95.
-# Fix like upstream for javamaker (which had the same change) in http://cgit.freedesktop.org/libreoffice/core/commit/?id=5f8015045cb59ff9574230530d371b6659697881
-Patch0:         libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
-Provides:       locale(OpenOffice_org:fi)
+Requires(postun): libreoffice >= 4.1
 Provides:       locale(libreoffice:fi)
-# compat stuff
-Provides:       OpenOffice_org-voikko = %{version}
-Obsoletes:      OpenOffice_org-voikko <= %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -62,23 +45,21 @@ LibreOffice spellchecker/hyphenator for finnish language, which uses
 libvoikko as backend.
 
 %prep
-%setup -q -n %{name}-rel-%{version}
-%patch0 -p1
+%setup -q
 
 %build
-. %ooo_prefix/%ooo_home/sdk/setsdkenv_unix.sh
-make oxt
+. %{_libdir}/libreoffice/sdk/setsdkenv_unix.sh
+make oxt %{?_smp_mflags}
 
 %install
 
 cd build
-voikkoPackage=$(pwd)/voikko.oxt
-mkdir -p %{buildroot}%ooo_prefix/%ooo_home/share/extensions/voikko
-cd %{buildroot}%ooo_prefix/%ooo_home/share/extensions/voikko
-unzip "$voikkoPackage"
+mkdir -p %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
+cd %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
+unzip voikko.oxt
 
 %files
 %defattr(-,root,root,0755)
-%ooo_prefix/%ooo_home/share/extensions/voikko
+%{_libdir}/libreoffice/share/extensions/voikko
 
 %changelog