diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc
index e9181d8..9e75d3f 100644
--- a/recipes-games/freeciv/freeciv.inc
+++ b/recipes-games/freeciv/freeciv.inc
@@ -20,7 +20,7 @@ file://wait-server-start.patch \
 S = "${WORKDIR}/freeciv-${PV}"
 B = "${WORKDIR}/build-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "\
 --enable-shared --enable-client=${FREECIV_GUI} \
@@ -34,7 +34,7 @@ SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 
 acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"
 
-PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-gtk3 ${PN}-qt"
+PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-qt"
 
 do_install_append() {
         rm -Rf ${D}/${datadir}/appdata
@@ -69,14 +69,6 @@ ${datadir}/freeciv/stdsounds \
 ${datadir}/icons/hicolor/*/*/freeciv-modpack.png \
 "
 
-RDEPENDS_${PN}-gtk3 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3 = "freeciv-client"
-FILES_${PN}-gtk3 = "\
-${bindir}/freeciv-gtk3 \
-${datadir}/freeciv/themes/gui-gtk-3.0 \
-${datadir}/freeciv/gtk_menus.xml \
-"
-
 RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
 RPROVIDES_${PN}-qt = "freeciv-client"
 FILES_${PN}-qt = "\
diff --git a/recipes-games/freeciv/freeciv_2.5.9.bb b/recipes-games/freeciv/freeciv_2.5.9.bb
index 3d36355..b1c9b2d 100644
--- a/recipes-games/freeciv/freeciv_2.5.9.bb
+++ b/recipes-games/freeciv/freeciv_2.5.9.bb
@@ -16,7 +16,7 @@ ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "dfae0812bb72b19e366f9d5c72e6c3f1"
 SRC_URI[sha256sum] = "b83c73585ae80898b27379984f936591b51422c9caccb94880fa16030c975928"
 
-PACKAGES =+ "${PN}-gtk2"
+PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3"
 
 RDEPENDS_${PN}-gtk2 = "freeciv-common freeciv-client-common"
 RPROVIDES_${PN}-gtk2 = "freeciv-client"
@@ -25,3 +25,11 @@ ${bindir}/freeciv-gtk2 \
 ${datadir}/freeciv/themes/gui-gtk-2.0 \
 ${datadir}/freeciv/gtk_menus.xml \
 "
+
+RDEPENDS_${PN}-gtk3 = "freeciv-common freeciv-client-common"
+RPROVIDES_${PN}-gtk3 = "freeciv-client"
+FILES_${PN}-gtk3 = "\
+${bindir}/freeciv-gtk3 \
+${datadir}/freeciv/themes/gui-gtk-3.0 \
+${datadir}/freeciv/gtk_menus.xml \
+"
diff --git a/recipes-games/freeciv/freeciv_S2_6.bb b/recipes-games/freeciv/freeciv_2.6.0-beta1.bb
similarity index 66%
rename from recipes-games/freeciv/freeciv_S2_6.bb
rename to recipes-games/freeciv/freeciv_2.6.0-beta1.bb
index e5edcea..72adf3c 100644
--- a/recipes-games/freeciv/freeciv_S2_6.bb
+++ b/recipes-games/freeciv/freeciv_2.6.0-beta1.bb
@@ -6,16 +6,13 @@ DEFAULT_PREFERENCE = "-1"
 
 DEPENDS += "libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
 
-BRANCH = "S2_6"
-SRCREV="34736"
-SRC_URI += "svn://svn.gna.org/svn/freeciv;module=branches/${BRANCH} \
-"
-PV = "2.6.0-beta0+r${SRCREV}"
-
-EXTRA_OECONF += "\
+SRC_URI += "\
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
+file://0002-Allow-building-without-tolua.patch \
 "
 
-S = "${WORKDIR}/branches/${BRANCH}"
+SRC_URI[md5sum] = "74dc470ba062eda0c9b0ffbc77582f72"
+SRC_URI[sha256sum] = "2738dc98073eb97c35f47d9b0d3b34decf783766ff7afbe08bded9092730b759"
 
 PACKAGES =+ "${PN}-sdl2 ${PN}-gtk3.22"
 
@@ -24,7 +21,7 @@ RPROVIDES_${PN}-gtk3.22 = "freeciv-client"
 FILES_${PN}-gtk3.22 = "\
 ${bindir}/freeciv-gtk3.22 \
 ${datadir}/freeciv/themes/gui-gtk-3.22 \
-${datadir}/freeciv/gtk3_menus.xml \
+${datadir}/freeciv/gtk3.22_menus.xml \
 "
 
 RDEPENDS_${PN}-sdl2 = "freeciv-common freeciv-client-common"