diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index e4f43322717f..11458bc0818b 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,82 +1,90 @@
 PORTNAME=	hatari
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.6.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
 
 MAINTAINER=	laurent.chardon@gmail.com
 COMMENT=	Atari ST emulator
 WWW=		https://hatari.tuxfamily.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
 BROKEN_armv6=	fails to configure: CMake Error: Generator: execution of make failed
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libudev.so:devel/libudev-devd \
 		libreadline.so:devel/readline \
 		libcapstone.so:devel/capstone
 
-USES=		cmake desktop-file-utils gnome python readline \
-		sdl shared-mime-info shebangfix tar:bzip2 xorg iconv
+USES=		cmake desktop-file-utils gnome localbase python readline sdl \
+		shared-mime-info shebangfix tar:bzip2 xorg
+
+USE_GITLAB=	yes
+GL_SITE=	https://framagit.org/
+
 USE_GNOME=	gtk30 pygobject3
-USE_XORG=	sm ice x11 xext
 USE_SDL=	sdl2
+USE_XORG=	ice sm x11 xext
 
 SHEBANG_FILES=	python-ui/*.py tools/*.py \
 		tools/debugger/*.py tools/hconsole/*.py
 
 CMAKE_ARGS=	-DETCDIR:PATH="${PREFIX}/etc"
 
-OPTIONS_DEFINE=		DEBUG DOCS DSP TRACE SMALL
+TEST_TARGET=	test
+
+OPTIONS_DEFINE=		DEBUG DOCS DSP SMALL TRACE
 OPTIONS_DEFAULT=	DOCS DSP TRACE
 
 DEBUG_DESC=		Build with debug information
 DOCS_DESC=		Install extra documentation
 DSP_DESC=		DSP 56k emulator for Falcon mode
-TRACE_DESC=		Tracing messages for debugging
 SMALL_DESC=		Use less memory at the expense of emulation speed
+TRACE_DESC=		Tracing messages for debugging
 
 DSP_CMAKE_BOOL=		ENABLE_DSP_EMU
-TRACE_CMAKE_BOOL=	ENABLE_TRACING
 SMALL_CMAKE_BOOL=	ENABLE_SMALL_MEM
-
-TEST_TARGET=	test
+TRACE_CMAKE_BOOL=	ENABLE_TRACING
 
 .include <bsd.port.options.mk>
 
 # CMAKE_ARGS CMAKE_BUILD_TYPE is getting overriden
 .if ${PORT_OPTIONS:MDEBUG}
-CMAKE_BUILD_TYPE=Debug
-INSTALL_TARGET=install
+CMAKE_BUILD_TYPE=	Debug
+INSTALL_TARGET=		install
 .else
-CMAKE_BUILD_TYPE=Release
+CMAKE_BUILD_TYPE=	Release
 .endif
 
 post-patch:
-.for i in doc/*.1 python-ui/*.1 tools/*.1 tools/debugger/*.1 tools/hconsole/*.1 tools/hmsa/*.1
 	@${REINPLACE_CMD} -e \
 		's|^/etc/hatari.cfg .*|${PREFIX}/etc/hatari.cfg| ; \
-		 s|/usr/share|${PREFIX}/share|' ${WRKSRC}/${i}
-.endfor
+		 s|/usr/share|${PREFIX}/share|' \
+		${WRKSRC}/doc/*.1 \
+		${WRKSRC}/python-ui/*.1 \
+		${WRKSRC}/tools/*.1 \
+		${WRKSRC}/tools/debugger/*.1 \
+		${WRKSRC}/tools/hconsole/*.1 \
+		${WRKSRC}/tools/hmsa/*.1
 	@${REINPLACE_CMD} -e \
 		's|-Wno-maybe-uninitialized||' ${WRKSRC}/src/cpu/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's|%%PYTHON_CMD%%|${PYTHON_CMD}| ; \
 		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' ${WRKSRC}/tools/atari-hd-image.sh
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/python-ui/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/debugger/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/hconsole/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/hmsa/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN}	${WRKSRC}/doc/*.1 \
+			${WRKSRC}/python-ui/*.1 \
+			${WRKSRC}/tools/*.1 \
+			${WRKSRC}/tools/debugger/*.1 \
+			${WRKSRC}/tools/hconsole/*.1 \
+			${WRKSRC}/tools/hmsa/*.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index 5a3cac4e6c7d..a000ad6cb475 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714071173
-SHA256 (hatari-2.5.0.tar.bz2) = d76c22fc3de69fb1bb4af3e8ba500b7e40f5a2a45d07783f24cb7101e53c3457
-SIZE (hatari-2.5.0.tar.bz2) = 2820580
+TIMESTAMP = 1754778212
+SHA256 (hatari-v2.6.0.tar.bz2) = fa1fa250c570e5096d4e2a065d0f53b20a0a5db1b7aa98fb34d5ee9a8b8ca86d
+SIZE (hatari-v2.6.0.tar.bz2) = 2130488
diff --git a/emulators/hatari/files/patch-tools_atari-hd-image.sh b/emulators/hatari/files/patch-tools_atari-hd-image.sh
index 9b92f43e239b..2b6cb31943d8 100644
--- a/emulators/hatari/files/patch-tools_atari-hd-image.sh
+++ b/emulators/hatari/files/patch-tools_atari-hd-image.sh
@@ -1,24 +1,22 @@
---- tools/atari-hd-image.sh.orig	2024-04-26 10:23:56 UTC
+--- tools/atari-hd-image.sh.orig	2025-08-09 22:33:00 UTC
 +++ tools/atari-hd-image.sh
 @@ -33,8 +33,8 @@ export PATH
  export PATH
  
  # check tools
 -if [ -z "$(which mkdosfs)" ] || [ -z "$(which python3)" ]; then
 -	echo "ERROR: either mkdosfs or python3 missing!"
-+if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_VERSION%%)" ]; then
-+	echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% missing!"
++if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_CMD%%)" ]; then
++	echo "ERROR: either mkdosfs or %%PYTHON_CMD%% missing!"
  	exit 1
  fi
  
-@@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Record / partition
+@@ -147,7 +147,7 @@ echo "$step) Create DOS Master Boot Record / partition
  # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector
  # For DOS MBR, the values are little endian.
  # -----------
 -python3 << EOF
--#!/usr/bin/env python3
-+%%PYTHON_VERSION%% << EOF
-+#!/usr/bin/env %%PYTHON_VERSION%%
++%%PYTHON_CMD%% << EOF
+ #!/usr/bin/python3
  mbr = bytearray(512)
  
- def set_long(idx, value):
diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist
index c1b06045aef2..a7923bf0d7ca 100644
--- a/emulators/hatari/pkg-plist
+++ b/emulators/hatari/pkg-plist
@@ -1,124 +1,122 @@
 bin/atari-convert-dir
 bin/atari-hd-image
 bin/gst2ascii
 bin/hatari
 bin/hatari-prg-args
 bin/hatari_profile
 bin/hatariui
 bin/hmsa
 bin/zip2st
 share/applications/hatari.desktop
 share/applications/hatariui.desktop
 %%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
 %%PORTDOCS%%%%DOCSDIR%%/authors.txt
 %%PORTDOCS%%%%DOCSDIR%%/bugs.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/coding.txt
 %%PORTDOCS%%%%DOCSDIR%%/compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/debugger.html
 %%PORTDOCS%%%%DOCSDIR%%/emutos.txt
 %%PORTDOCS%%%%DOCSDIR%%/hatari-ui.html
 %%PORTDOCS%%%%DOCSDIR%%/hatariui/README
 %%PORTDOCS%%%%DOCSDIR%%/hatariui/TODO
 %%PORTDOCS%%%%DOCSDIR%%/hatariui/release-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/hconsole/release-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png
 %%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg
 %%PORTDOCS%%%%DOCSDIR%%/images/cpu.png
 %%PORTDOCS%%%%DOCSDIR%%/images/devices-portmidi.png
 %%PORTDOCS%%%%DOCSDIR%%/images/devices.png
 %%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png
 %%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png
 %%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-0.7.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-0.9.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-debug.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-input.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-noembed.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-peripherals.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-quit.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-setup-edit.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-setup.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-speed.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hatari-ui-trace.png
 %%PORTDOCS%%%%DOCSDIR%%/images/joystick.png
 %%PORTDOCS%%%%DOCSDIR%%/images/kcachegrind.png
 %%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png
 %%PORTDOCS%%%%DOCSDIR%%/images/main.png
 %%PORTDOCS%%%%DOCSDIR%%/images/memory.png
 %%PORTDOCS%%%%DOCSDIR%%/images/monitor.png
 %%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png
 %%PORTDOCS%%%%DOCSDIR%%/images/screen.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sound.png
 %%PORTDOCS%%%%DOCSDIR%%/images/system.png
 %%PORTDOCS%%%%DOCSDIR%%/images/tos.png
 %%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt
 %%PORTDOCS%%%%DOCSDIR%%/m68k-linux.txt
 %%PORTDOCS%%%%DOCSDIR%%/m68k-netbsd.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.css
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt
 %%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-checklist.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/scsi-driver.txt
 %%PORTDOCS%%%%DOCSDIR%%/thanks.txt
 %%PORTDOCS%%%%DOCSDIR%%/toc.js
 %%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%PORTDOCS%%%%DOCSDIR%%/video-recording.txt
 %%DATADIR%%/hatari-icon.bmp
 %%DATADIR%%/hatariui/config.py
 %%DATADIR%%/hatariui/conftypes.py
 %%DATADIR%%/hatariui/debugui.py
 %%DATADIR%%/hatariui/dialogs.py
 %%DATADIR%%/hatariui/hatari-icon.png
 %%DATADIR%%/hatariui/hatari-logo.png
 %%DATADIR%%/hatariui/hatari.py
 %%DATADIR%%/hatariui/hatariui.py
 %%DATADIR%%/hatariui/uihelpers.py
 %%DATADIR%%/hconsole/example-commands
 %%DATADIR%%/hconsole/example-debugger
 %%DATADIR%%/hconsole/example.py
 %%DATADIR%%/hconsole/hconsole.py
-%%DATADIR%%/tos.img
 share/icons/hicolor/128x128/apps/hatari.png
 share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png
 share/icons/hicolor/128x128/mimetypes/application-x-st-disk-image.png
 share/icons/hicolor/128x128/mimetypes/application-x-stx-disk-image.png
 share/icons/hicolor/256x256/apps/hatari.png
 share/icons/hicolor/256x256/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/256x256/mimetypes/application-vnd.msa-disk-image.png
 share/icons/hicolor/256x256/mimetypes/application-x-st-disk-image.png
 share/icons/hicolor/256x256/mimetypes/application-x-stx-disk-image.png
 share/icons/hicolor/32x32/apps/hatari.png
 share/icons/hicolor/32x32/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/32x32/mimetypes/application-vnd.msa-disk-image.png
 share/icons/hicolor/32x32/mimetypes/application-x-st-disk-image.png
 share/icons/hicolor/32x32/mimetypes/application-x-stx-disk-image.png
 share/icons/hicolor/48x48/apps/hatari.png
 share/icons/hicolor/48x48/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/48x48/mimetypes/application-vnd.msa-disk-image.png
 share/icons/hicolor/48x48/mimetypes/application-x-st-disk-image.png
 share/icons/hicolor/48x48/mimetypes/application-x-stx-disk-image.png
 share/icons/hicolor/64x64/apps/hatari.png
 share/icons/hicolor/64x64/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/64x64/mimetypes/application-vnd.msa-disk-image.png
 share/icons/hicolor/64x64/mimetypes/application-x-st-disk-image.png
 share/icons/hicolor/64x64/mimetypes/application-x-stx-disk-image.png
 share/icons/hicolor/scalable/apps/hatari.svg
 share/icons/hicolor/scalable/mimetypes/application-vnd.fastcopy-disk-image.svg
 share/icons/hicolor/scalable/mimetypes/application-vnd.msa-disk-image.svg
 share/icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
 share/icons/hicolor/scalable/mimetypes/application-x-stx-disk-image.svg
 share/man/man1/atari-convert-dir.1.gz
 share/man/man1/atari-hd-image.1.gz
 share/man/man1/gst2ascii.1.gz
 share/man/man1/hatari-prg-args.1.gz
 share/man/man1/hatari.1.gz
 share/man/man1/hatari_profile.1.gz
 share/man/man1/hatariui.1.gz
 share/man/man1/hconsole.1.gz
 share/man/man1/hmsa.1.gz
 share/man/man1/zip2st.1.gz
 share/mime/packages/hatari.xml