diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index b5a45cdcaf3f..7763f0943264 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mapserver
-DISTVERSION=	8.2.2
-PORTREVISION=	2
+DISTVERSION=	8.4.0
 CATEGORIES=	graphics www geography
 MASTER_SITES=	https://download.osgeo.org/${PORTNAME}/ \
 		https://github.com/MapServer/MapServer/releases/download/rel-${DISTVERSION:S|.|-|g}/
diff --git a/graphics/mapserver/distinfo b/graphics/mapserver/distinfo
index e332240b2dfb..a0d706d00de0 100644
--- a/graphics/mapserver/distinfo
+++ b/graphics/mapserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725454292
-SHA256 (mapserver-8.2.2.tar.gz) = 47d8ee4bd12ddd2f04b24aa84c6e58f8e6990bcd5c150ba42e22f30ad30568e4
-SIZE (mapserver-8.2.2.tar.gz) = 2966634
+TIMESTAMP = 1737341744
+SHA256 (mapserver-8.4.0.tar.gz) = b0cb3612cd58458cca0808b117c16b9415b3231af39aefb90d668e8b8b188e2c
+SIZE (mapserver-8.4.0.tar.gz) = 2986653
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 7b34689dd34b..1d14a3a8fa53 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -9,6 +9,6 @@ bin/mapserver_sortshp
 bin/mapserver_tile4ms
 lib/libmapserver.so
 lib/libmapserver.so.2
-lib/libmapserver.so.8.2.2
+lib/libmapserver.so.8.4.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so