diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index 41b7526eccd2..915412b6d7c3 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -1,64 +1,60 @@
 PORTNAME=	simutrans
-DISTVERSION=	124-2-2
-PORTREVISION=	1
+DISTVERSION=	124.3
 CATEGORIES=	games
-MASTER_SITES=	SF/simutrans/simutrans/${DISTVERSION}
-DISTNAME=	simutrans-src-${DISTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Transportation simulator
 WWW=		https://www.simutrans.com/
 
 LICENSE=	ART10 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_ART10=	${WRKSRC}/simutrans/license.txt
 LICENSE_FILE_MIT=	${WRKSRC}/simutrans/license_squirrel.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libzstd.so:archivers/zstd
 
-USES=		cmake compiler:c++14-lang pkgconfig sdl zip
+USES=		cmake compiler:c++14-lang pkgconfig sdl
+USE_GITHUB=	yes
 USE_SDL=	sdl2
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_CCache \
 		CMAKE_DISABLE_FIND_PACKAGE_Git \
 		CMAKE_DISABLE_FIND_PACKAGE_Subversion
 CMAKE_ARGS=	-DSIMUTRANS_USE_REVISION=1
 
-WRKSRC=		${WRKDIR}/simutrans-master
-
 PORTDATA=	*
 PORTDOCS=	change_request.txt \
 		history.txt \
 		problem_report.txt \
 		readme.txt \
 		thanks.txt
 
 DESKTOP_ENTRIES=Simutrans "" simutrans simutrans "Game;Simulation;" false
 
 OPTIONS_DEFINE=	DOCS UPNP FLUIDSYNTH
 OPTIONS_MULTI=	PAKS
 OPTIONS_MULTI_PAKS=	PAK64 PAK128 PAK128_GERMAN
 OPTIONS_DEFAULT=PAK128 UPNP FLUIDSYNTH
 
 PAKS_DESC=			Graphics sets
 PAK64_DESC=			Enable low resolution graphics set
 PAK64_RUN_DEPENDS=		simutrans-pak64>=0:games/simutrans-pak64
 PAK128_DESC=			Enable high resolution graphics set
 PAK128_RUN_DEPENDS=		simutrans-pak128>=0:games/simutrans-pak128
 PAK128_GERMAN_DESC=		Enable german graphics set
 PAK128_GERMAN_RUN_DEPENDS=	simutrans-pak128.german>=0:games/simutrans-pak128.german
 
 UPNP_DESC=			Use MiniUPNP for easier server setup
 UPNP_LIB_DEPENDS=		libminiupnpc.so:net/miniupnpc
 UPNP_CMAKE_BOOL=		SIMUTRANS_USE_UPNP
 
 FLUIDSYNTH_DESC=		Enable FluidSynth for MIDI playback
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_BOOL=		SIMUTRANS_USE_FLUIDSYNTH_MIDI
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/simutrans && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo
index 885576cc4d96..7471cf0d0c64 100644
--- a/games/simutrans/distinfo
+++ b/games/simutrans/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725071923
-SHA256 (simutrans-src-124-2-2.zip) = 9fc744b4d21fc6bf1e36dd081906eb9ced31c44fc3a680475ddb29fde818cf4a
-SIZE (simutrans-src-124-2-2.zip) = 5569050
+TIMESTAMP = 1738763106
+SHA256 (simutrans-simutrans-124.3_GH0.tar.gz) = ecc1abe6d1f99216718301c0c95c02bb9f4718edaf2272c77760e60b7c282e27
+SIZE (simutrans-simutrans-124.3_GH0.tar.gz) = 4555274
diff --git a/games/simutrans/files/patch-CMakeLists.txt b/games/simutrans/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..df68ec5a9071
--- /dev/null
+++ b/games/simutrans/files/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+Fixed upstream in https://github.com/simutrans/simutrans/commit/81d5165874303edcdbe81ba07df1fea8d5e03f4b
+
+Remove this patch with next update
+--- CMakeLists.txt.orig	2025-01-11 14:40:58 UTC
++++ CMakeLists.txt
+@@ -95,6 +95,9 @@ if (${SIMUTRANS_USE_REVISION})
+ if (${SIMUTRANS_USE_REVISION})
+ 	file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/src/simutrans/revision.h "#define REVISION ${SIMUTRANS_USE_REVISION}\n")
+ 	message(STATUS "Compiling Simutrans with manually specified revision ${SIMUTRANS_USE_REVISION}")
++	set(SIMUTRANS_WC_REVISION ${SIMUTRANS_USE_REVISION})
++	set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
++	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SimutransRevision.cmake)
+ else ()
+ 	string(FIND ${CMAKE_GENERATOR} "Visual Studio" VS )
+ 	if (${VS} EQUAL 0)
diff --git a/games/simutrans/files/patch-src_simutrans_sys_simsys.cc b/games/simutrans/files/patch-src_simutrans_sys_simsys.cc
index ac91496e836c..61d3ec743b88 100644
--- a/games/simutrans/files/patch-src_simutrans_sys_simsys.cc
+++ b/games/simutrans/files/patch-src_simutrans_sys_simsys.cc
@@ -1,14 +1,15 @@
---- src/simutrans/sys/simsys.cc.orig	2024-05-04 14:27:27 UTC
+--- src/simutrans/sys/simsys.cc.orig	2024-12-29 01:27:00 UTC
 +++ src/simutrans/sys/simsys.cc
-@@ -526,9 +526,9 @@ char const *dr_query_homedir()
- 	}
- #else
+@@ -562,10 +562,10 @@ char const *dr_query_homedir()
+ 	int maxlen = PATH_MAX + 22;
+ 	unsigned n;
  	if( getenv("XDG_DATA_HOME") == NULL ) {
--		sprintf(buffer, "%s/simutrans", getenv("HOME"));
-+		sprintf(buffer, "%s/.simutrans", getenv("HOME"));
- 	} else {
--		sprintf(buffer, "%s/simutrans", getenv("XDG_DATA_HOME"));
-+		sprintf(buffer, "%s/.simutrans", getenv("XDG_DATA_HOME"));
+-		n = snprintf(buffer, maxlen, "%s/simutrans", getenv("HOME"));
++		n = snprintf(buffer, maxlen, "%s/.simutrans", getenv("HOME"));
+ 	}
+ 	else {
+-		n = snprintf(buffer, maxlen, "%s/simutrans", getenv("XDG_DATA_HOME"));
++		n = snprintf(buffer, maxlen, "%s/.simutrans", getenv("XDG_DATA_HOME"));
  	}
- #endif
- 
+ 	if (n >= maxlen) {
+ 		return NULL;