diff --git a/.gitignore b/.gitignore
index 2a34db7..e6569a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ freeciv-2.2.2.tar.bz2
 /freeciv-2.5.7.tar.bz2
 /freeciv-2.5.8.tar.bz2
 /freeciv-2.5.9.tar.bz2
+/freeciv-2.6.0-beta1.tar.bz2
diff --git a/freeciv.spec b/freeciv.spec
index 06793fc..52e668e 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -5,21 +5,21 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.5.9
-Release:        1%{?dist}
+Version:        2.6.0
+Release:        0%{?dist}.beta1
 Summary:        A multi-player strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/freeciv/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-beta1.tar.bz2
 #Patch0:         freeciv-2.3.2-hardened-SDL_mixer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ##Fix DSO patch
-Patch10:	freeciv-client-fix-DSO.patch
+#Patch10:	freeciv-client-fix-DSO.patch
 
-BuildRequires:	gtk2-devel
+BuildRequires:	gtk3-devel
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
 BuildRequires:	SDL_mixer-devel
@@ -43,8 +43,8 @@ in order to become the leader of the greatest civilization.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch10 -p0
+%setup -q -n %{name}-%{version}-beta1
+#%patch10 -p0
 #%patch0 -p1
 
 %build
@@ -56,10 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 %find_lang %{name}-nations
+%find_lang %{name}-ruledit
 
-desktop-file-install --delete-original	\
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gtk2.desktop
+#desktop-file-install --delete-original	\
+#	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+#	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gtk2.desktop
 
 desktop-file-install --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications  	\
@@ -67,7 +68,7 @@ desktop-file-install --delete-original \
 
 desktop-file-install --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-mp-gtk2.desktop
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-mp-gtk3.desktop
 
 %if 0%{?rhel}
 # On RHEL 7, the doc macro puts docs in a versioned subdir
@@ -78,9 +79,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/freeciv/
 #rm $RPM_BUILD_ROOT%{_bindir}/civmanual
 # ggz config
 # omit ggz.modules, to register at install, not build, time.
-rm $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
+#rm $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 # include .dsc files
-install -p -D -m644 data/civclient.dsc $RPM_BUILD_ROOT%{_ggz_datadir}/civclient.dsc
+#install -p -D -m644 data/civclient.dsc $RPM_BUILD_ROOT%{_ggz_datadir}/civclient.dsc
 find $RPM_BUILD_ROOT -name '*.la' -delete
 find $RPM_BUILD_ROOT -name '*.a' -delete
 
@@ -106,12 +107,12 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 
-%files -f %{name}.lang -f %{name}-nations.lang
+%files -f %{name}.lang -f %{name}-nations.lang -f %{name}-ruledit.lang
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS-2.5 COPYING NEWS doc doc/*
+%doc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS doc doc/*
 %{_bindir}/freeciv-server
-%{_bindir}/freeciv-gtk2
-%{_bindir}/freeciv-mp-gtk2
+%{_bindir}/freeciv-gtk3
+%{_bindir}/freeciv-mp-gtk3
 %{_bindir}/freeciv-manual
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
@@ -119,10 +120,13 @@ fi
 %{_datadir}/pixmaps/%{name}-client.png
 %{_datadir}/appdata/*
 %{_mandir}/man6/freeciv*6*
-%{_ggz_datadir}/civclient.dsc
+#%{_ggz_datadir}/civclient.dsc
 %{_sysconfdir}/freeciv/database.lua
 
 %changelog
+* Mon Sep 18 2017 Gwyn Ciesla <limburgher@gmail.com> - 2.6.0-0.beta1
+- 2.6.0 beta1.
+
 * Sat Aug 19 2017 Gwyn Ciesla <limburgher@gmail.com> - 2.5.9-1
 - 2.5.9.
 
diff --git a/sources b/sources
index 39b4634..4758668 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (freeciv-2.5.9.tar.bz2) = e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
+SHA512 (freeciv-2.6.0-beta1.tar.bz2) = 5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5