diff --git a/geo/mapserver/Makefile b/geo/mapserver/Makefile
index fe1013b7d21..0a3d118b710 100644
--- a/geo/mapserver/Makefile
+++ b/geo/mapserver/Makefile
@@ -6,8 +6,7 @@ COMMENT-php=	PHP Mapscript extension
 COMMENT-perl=	Perl Mapscript binding
 COMMENT-python=	Python Mapscript binding
 
-V=		8.6.0
-REVISION=	0
+V=		8.6.1
 DISTNAME=	mapserver-${V}
 PKGNAME-main=	mapserver-${V:S/-//}
 PKGNAME-utils=	mapserver-utils-${V:S/-//}
diff --git a/geo/mapserver/distinfo b/geo/mapserver/distinfo
index 2768c544255..944cdfebb68 100644
--- a/geo/mapserver/distinfo
+++ b/geo/mapserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mapserver-8.6.0.tar.gz) = rx9te2tDYdewMFtOoYaeM/pJpyG7wOKOE90BWVLf2QI=
-SIZE (mapserver-8.6.0.tar.gz) = 3003764
+SHA256 (mapserver-8.6.1.tar.gz) = /0wzJx6RtGuk0rJJkNxIC8ODniA+U0ECsglKYWZEbEs=
+SIZE (mapserver-8.6.1.tar.gz) = 3005173