diff --git a/games-strategy/freeciv/freeciv-2.6.6.recipe b/games-strategy/freeciv/freeciv-3.0.7.recipe
similarity index 76%
rename from games-strategy/freeciv/freeciv-2.6.6.recipe
rename to games-strategy/freeciv/freeciv-3.0.7.recipe
index c94e68c9f..c015a9c5a 100644
--- a/games-strategy/freeciv/freeciv-2.6.6.recipe
+++ b/games-strategy/freeciv/freeciv-3.0.7.recipe
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.freeciv.org/"
 COPYRIGHT="1996-2020 The Freeciv Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://netix.dl.sourceforge.net/project/freeciv/Freeciv%202.6/$portVersion/freeciv-$portVersion.tar.bz2"
-CHECKSUM_SHA256="7bcfe5dd3c081122e7cde7cdb24f57c3681d6a9667496faed207a91ac3165811"
+SOURCE_URI="https://downloads.sourceforge.net/sourceforge/freeciv/freeciv-$portVersion.tar.xz"
+CHECKSUM_SHA256="f6e606f17ed03d971272883f1a4879f5c1c2c247f64b8edefa6a25c8a2a8dac4"
 ADDITIONAL_FILES="freeciv.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -34,7 +34,8 @@ PROVIDES="
 	freeciv$secondaryArchSuffix = $portVersion
 	app:FreeCiv = $portVersion
 	cmd:freeciv_manual$commandSuffix
-	cmd:freeciv_sdl$commandSuffix
+	cmd:freeciv_ruleup$commandSuffix
+	cmd:freeciv_sdl2$commandSuffix
 	cmd:freeciv_server$commandSuffix
 	lib:libfreeciv$secondaryArchSuffix
 	lib:libfreeciv_srv$secondaryArchSuffix
@@ -45,16 +46,18 @@ REQUIRES="
 	lib:libcurl$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:liblua$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
+	lib:liblua$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
-	lib:libSDL_1.2$secondaryArchSuffix
-	lib:libSDL_gfx$secondaryArchSuffix
-	lib:libSDL_image_1.2$secondaryArchSuffix
-	lib:libSDL_mixer_1.2$secondaryArchSuffix
-	lib:libSDL_ttf_2.0$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
+	lib:libSDL2_gfx_1.0$secondaryArchSuffix
+	lib:libSDL2_image_2.0$secondaryArchSuffix
+	lib:libSDL2_mixer_2.0$secondaryArchSuffix
+	lib:libSDL2_ttf_2.0$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -63,20 +66,22 @@ BUILD_REQUIRES="
 	devel:libbz2$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:liblua$secondaryArchSuffix >= 5.3
-	devel:libintl$secondaryArchSuffix
 	devel:liblzma$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
-	devel:libSDL_1.2$secondaryArchSuffix
-	devel:libSDL_gfx$secondaryArchSuffix
-	devel:libSDL_image_1.2$secondaryArchSuffix
-	devel:libSDL_mixer_1.2$secondaryArchSuffix
-	devel:libSDL_ttf_2.0$secondaryArchSuffix
+	devel:libsdl2_2.0$secondaryArchSuffix
+	devel:libsdl2_gfx$secondaryArchSuffix
+	devel:libsdl2_image_2.0$secondaryArchSuffix
+	devel:libsdl2_mixer_2.0$secondaryArchSuffix
+	devel:libsdl2_ttf_2.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmp
 	cmd:find
+	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
@@ -87,7 +92,7 @@ BUILD()
 {
 	AUTOCONF=: AUTOMAKE=: ACLOCAL=: CFLAGS="-O2 -pipe" \
 		runConfigure --omit-dirs binDir ./configure \
-		--bindir=$commandBinDir --enable-client=sdl --enable-fcmp=no \
+		--bindir=$commandBinDir --enable-client=sdl2 --enable-fcmp=no \
 		--enable-sys-lua --enable-shared --disable-static
 	make $jobArgs
 }
@@ -99,7 +104,7 @@ INSTALL()
 	rm -f $libDir/*.a $libDir/*.la
 
 	mkdir -p $appsDir
-	ln -s $commandBinDir/freeciv-sdl $appsDir/Freeciv
+	ln -s $commandBinDir/freeciv-sdl2 $appsDir/Freeciv
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"