diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index bd30da8f3705..314167b569b4 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	2020.1.3
+PORTVERSION=	2020.3.1
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -32,10 +32,4 @@ LDFLAGS+=	${LDFLAGS_${CHOSEN_COMPILER_TYPE}}
 CMAKE_ARGS+=	-DSYSTEM_EXPAT:BOOL=ON \
 		-DENABLE_TESTS:BOOL=OFF
 
-post-patch:
-# Avoid conflict with C++20 <version> by adding .txt suffix
-	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
-	@${REINPLACE_CMD} -Ei .c++20 '/file|set_prop/s/version[[:>:]]/&.txt/' \
-		${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index 9a289091efbf..e1e58e60fc69 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593452924
-SHA256 (simgear-2020.1.3.tar.bz2) = 66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1
-SIZE (simgear-2020.1.3.tar.bz2) = 1393653
+TIMESTAMP = 1604090901
+SHA256 (simgear-2020.3.1.tar.bz2) = 15262bb1703c3024184330c9af7706d4f75b2d40d449cded522c0c564a8e1927
+SIZE (simgear-2020.3.1.tar.bz2) = 1405112
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index 9b0b29c78785..f9dece64f7b3 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -57,6 +57,8 @@ include/simgear/debug/BufferedLogCallback.hxx
 include/simgear/debug/OsgIoCapture.hxx
 include/simgear/debug/debug_types.h
 include/simgear/debug/logstream.hxx
+include/simgear/debug/LogCallback.hxx
+include/simgear/debug/LogEntry.hxx
 include/simgear/embedded_resources/EmbeddedResource.hxx
 include/simgear/embedded_resources/EmbeddedResourceManager.hxx
 include/simgear/embedded_resources/EmbeddedResourceProxy.hxx
@@ -354,6 +356,6 @@ lib/cmake/SimGear/SimGearConfigVersion.cmake
 lib/cmake/SimGear/SimGearTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SimGear/SimGearTargets.cmake
 lib/libSimGearCore.so
-lib/libSimGearCore.so.2020.1.3
+lib/libSimGearCore.so.2020.3.1
 lib/libSimGearScene.so
-lib/libSimGearScene.so.2020.1.3
+lib/libSimGearScene.so.2020.3.1
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index b6f0801b6e60..c5d1e7df0021 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	2020.1.3
+PORTVERSION=	2020.3.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 DISTNAME=	FlightGear-${PORTVERSION}-data
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 85026f49ec6a..a0308878d012 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593461060
-SHA256 (FlightGear-2020.1.3-data.tar.bz2) = 2196f4ffcdeaae3a8b0a2b6ebf62a456bfd0198abb6c0619f763204d89804a03
-SIZE (FlightGear-2020.1.3-data.tar.bz2) = 1954941831
+TIMESTAMP = 1604091568
+SHA256 (FlightGear-2020.3.1-data.tar.bz2) = d4fd913c4dfa716744186725046f5b1ce85377c2bcb60da4a8eb792be2e0f982
+SIZE (FlightGear-2020.3.1-data.tar.bz2) = 1992836312
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index a41e43d3fd3b..741bbce4e04c 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	2020.1.3
-PORTREVISION=	1
+PORTVERSION=	2020.3.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -56,10 +55,4 @@ QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
 QT5_USES=	qt:5
 QT5_USE=	QT=core,buildtools,linguisttools,gui,declarative,network,qmake,widgets,svg
 
-post-patch:
-# Avoid conflict with C++20 <version> by adding .txt suffix
-	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
-	@${REINPLACE_CMD} -Ei .c++20 '/file|set_prop/s/version[[:>:]]/&.txt/' \
-		${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index b6e331d0aff2..700e0028ce3e 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593459986
-SHA256 (flightgear-2020.1.3.tar.bz2) = 1f07e8ef2c558dae3b9738e313b57e711d38e569f85d49fc2c5ae647e3949a17
-SIZE (flightgear-2020.1.3.tar.bz2) = 8504317
+TIMESTAMP = 1604092672
+SHA256 (flightgear-2020.3.1.tar.bz2) = 8860d13f8ca41d387dce1850b90650c5e440e3e2505021180d303dfa4784d103
+SIZE (flightgear-2020.3.1.tar.bz2) = 8797543