diff --git a/freeciv-2.5.10.tar.bz2 b/freeciv-2.5.10.tar.bz2
deleted file mode 100644
index 73106db..0000000
--- a/freeciv-2.5.10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8a14156562dce2f0a7b96390c2d5a35314f1124c448782a6a47b0c51cfcb302
-size 40920632
diff --git a/freeciv-2.5.11.tar.bz2 b/freeciv-2.5.11.tar.bz2
new file mode 100644
index 0000000..de05771
--- /dev/null
+++ b/freeciv-2.5.11.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c9c526952fe977cb4b302b8ccf75798fd066c6dde670f72f677fe4964259aad
+size 40940090
diff --git a/freeciv.changes b/freeciv.changes
index 90cca94..49fb526 100644
--- a/freeciv.changes
+++ b/freeciv.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Jun 15 20:10:21 UTC 2018 - astieger@suse.com
+
+- freeciv 2.5.11:
+  * Stealing a future technology was accidentally yielding two of
+    them
+  * Put a message about nuclear attack in a more appropriate
+    category
+  * Some minor improvements to autogenerated terrain help
+  * Fix a crash with a malformed tileset
+  * Fix an erroneous diagnostic for a malformed savegame
+  * Fix a geographical error in the Cuyavian nation description
+  * Fix typo in ruleset help comments
+  * Fix some compiler warnings
+  * Updated translations
+
 -------------------------------------------------------------------
 Thu Feb  1 21:22:16 UTC 2018 - astieger@suse.com
 
diff --git a/freeciv.spec b/freeciv.spec
index c11a886..6125b65 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -17,26 +17,19 @@
 
 
 Name:           freeciv
-Version:        2.5.10
+Version:        2.5.11
 Release:        0
 Summary:        Free Civilization Clone
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Amusements/Games/Strategy/Turn Based
-Url:            http://www.freeciv.org
+URL:            http://www.freeciv.org
 Source0:        http://files.freeciv.org/stable/%{name}-%{version}.tar.bz2
 Source1:        freeciv-gtk3.desktop
-%if 0%{?suse_version} >= 1320
-Source2:        freeciv-qt.desktop
-%endif
 Source3:        freeciv.png
 Source4:        freeciv-manual
 Source5:        freeciv-manual.desktop
 Source6:        freeciv-manual.png
 Patch0:         freeciv-appdata-desktop-references.patch
-%if 0%{?suse_version} >= 1320
-Patch1:         fix-qt5-detection.patch
-%endif
-Requires:       freeciv_client-%version
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  autoconf
@@ -47,15 +40,21 @@ BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libggz2-devel
-%if 0%{?suse_version} >= 1320
-BuildRequires:  libqt5-qtbase-common-devel
-BuildRequires:  libqt5-qtbase-devel
-%endif
 BuildRequires:  libtool
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xz-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       freeciv_client-%{version}
+%if 0%{?suse_version} >= 1320
+Source2:        freeciv-qt.desktop
+%endif
+%if 0%{?suse_version} >= 1320
+Patch1:         fix-qt5-detection.patch
+%endif
+%if 0%{?suse_version} >= 1320
+BuildRequires:  libqt5-qtbase-common-devel
+BuildRequires:  libqt5-qtbase-devel
+%endif
 
 %description
 A clone of the well known game Civilization by Microprose.
@@ -71,8 +70,8 @@ client 'civclient'. Have fun!
 %package qt
 Summary:        Qt client for freeciv
 Group:          Amusements/Games/Strategy/Turn Based
-Provides:       freeciv_client-%version
-Requires:       freeciv = %version
+Requires:       freeciv = %{version}
+Provides:       freeciv_client-%{version}
 
 %description qt
 Freeciv executable using Qt library
@@ -81,14 +80,13 @@ Freeciv executable using Qt library
 %package gtk3
 Summary:        Gtk3 client for freeciv
 Group:          Amusements/Games/Strategy/Turn Based
-Provides:       freeciv_client-%version
-Requires:       freeciv = %version
+Requires:       freeciv = %{version}
+Provides:       freeciv_client-%{version}
 Obsoletes:      freeciv-gtk2
 
 %description gtk3
 Freeciv executable using Gtk3 library
 
-
 %prep
 %setup -q
 %patch0 -p1
@@ -115,8 +113,8 @@ autoreconf -fi
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-install -m 755 $RPM_SOURCE_DIR/freeciv-manual %{buildroot}%{_prefix}/bin
+%make_install
+install -m 755 $RPM_SOURCE_DIR/freeciv-manual %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/pixmaps/
 install -m 644 $RPM_SOURCE_DIR/*.png %{buildroot}%{_datadir}/pixmaps
 rm %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -134,12 +132,11 @@ rm -rf %{buildroot}/%{_datadir}/locale/no
 %fdupes %{buildroot}/%{_datadir}/
 
 %files -f %{name}.lang -f %{name}-nations.lang
-%defattr(-,root,root)
 %doc %{_docdir}/freeciv
 %exclude %{_docdir}/freeciv/INSTALL*
 %exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
-%{_mandir}/man6/freeciv-*.6.gz
+%{_mandir}/man6/freeciv-*.6%{?ext_man}
 %dir %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/%{name}/database.lua
 %{_bindir}/freeciv-server
@@ -171,7 +168,6 @@ rm -rf %{buildroot}/%{_datadir}/locale/no
 %{_datadir}/appdata/freeciv-server.appdata.xml
 
 %files gtk3
-%defattr(-,root,root)
 %{_bindir}/freeciv-gtk3
 %{_bindir}/freeciv-mp-gtk3
 %{_datadir}/applications/%{name}-gtk3.desktop
@@ -181,7 +177,6 @@ rm -rf %{buildroot}/%{_datadir}/locale/no
 
 %if 0%{?suse_version} >= 1320
 %files qt
-%defattr(-,root,root)
 %{_bindir}/freeciv-qt
 %{_datadir}/applications/%{name}-qt.desktop
 %{_datadir}/appdata/freeciv-qt.appdata.xml