diff --git a/libreoffice.changes b/libreoffice.changes
index cda600c..65e353d 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  1 10:05:24 UTC 2017 - tchvatal@suse.com
+
+- Switch to normal mirror location
+
 -------------------------------------------------------------------
 Sat May 27 11:22:18 UTC 2017 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index d138b86..7103e5a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -22,8 +22,7 @@
 %define         numbertext_version 0.9.5
 # Urls
 %define         external_url       http://dev-www.libreoffice.org/src/
-#%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.3.3
-%define         tarball_url        http://dev-builds.libreoffice.org/pre-releases/src/
+%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.4.0
 # Wether to enable the kde integration
 %if 0%{?is_opensuse}
 %bcond_without kdeintegration
@@ -113,8 +112,8 @@ BuildRequires:  dejavu-fonts
 # Needed for tests
 BuildRequires:  google-carlito-fonts
 BuildRequires:  gperf
-BuildRequires:  libgpgmepp-devel
 BuildRequires:  hyphen-devel
+BuildRequires:  libgpgmepp-devel
 # genbrk binary is required
 BuildRequires:  icu
 BuildRequires:  java-devel >= 1.6
@@ -964,7 +963,7 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
 %ifarch aarch64 ppc64 ppc64le
 for xx in forecast.ets.add forecast.ets.mult linest logest minverse rate
 do
-    rm sc/qa/unit/data/functions/fods/$xx.fods
+    rm -f sc/qa/unit/data/functions/fods/$xx.fods
 done
 %endif