diff --git a/freeciv-2.5.6.tar.bz2 b/freeciv-2.5.6.tar.bz2
deleted file mode 100644
index 6f3caab..0000000
--- a/freeciv-2.5.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b
-size 41185678
diff --git a/freeciv-2.5.8.tar.bz2 b/freeciv-2.5.8.tar.bz2
new file mode 100644
index 0000000..39d3c71
--- /dev/null
+++ b/freeciv-2.5.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6781e655c514d0a86975c87235de24f740cbdf81f33711d68a910b360963bd30
+size 41176592
diff --git a/freeciv.changes b/freeciv.changes
index 3246b9b..1874dee 100644
--- a/freeciv.changes
+++ b/freeciv.changes
@@ -1,7 +1,16 @@
+-------------------------------------------------------------------
+Sun Aug 13 16:23:52 UTC 2017 - astieger@suse.com
+
+- Freeciv 2.5.8:
+  * Various fixes, including safegame fixes
+- for a full list of upstream changes see
+    http://freeciv.wikia.com/wiki/NEWS-2.5.7
+    http://freeciv.wikia.com/wiki/NEWS-2.5.8
+
 -------------------------------------------------------------------
 Sun Dec 11 09:41:31 UTC 2016 - mimi.vx@gmail.com
 
-- Freciv 2.5.6
+- Freeciv 2.5.6
   * various fixes and changes for rulesets
   * general fixes
 - for a full list of upstream changes see
diff --git a/freeciv.spec b/freeciv.spec
index 7eac495..f4a769c 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package freeciv
 #
-# Copyright (c) 2016 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
@@ -17,13 +17,13 @@
 
 
 Name:           freeciv
-Version:        2.5.6
+Version:        2.5.8
 Release:        0
 Summary:        Free Civilization Clone
 License:        GPL-2.0+
 Group:          Amusements/Games/Strategy/Turn Based
 Url:            http://www.freeciv.org
-Source0:        http://download.gna.org/freeciv/stable/%{name}-%{version}.tar.bz2
+Source0:        http://files.freeciv.org/stable/%{name}-%{version}.tar.bz2
 Source1:        freeciv-gtk3.desktop
 %if 0%{?suse_version} >= 1320
 Source2:        freeciv-qt.desktop