diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 64e825b29976..8d7ee91de32f 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	ntopng
 PORTVERSION=	5.6.d20230531
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 WWW=		https://www.ntop.org/products/traffic-analysis/ntop/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool \
 		libzmq.so:net/libzmq4 \
 		libcurl.so:ftp/curl \
 		libndpi.so:net/ndpi \
 		libjson-c.so:devel/json-c \
 		libsodium.so:security/libsodium \
 		libmaxminddb.so:net/libmaxminddb \
 		libexpat.so:textproc/expat2 \
 		libzstd.so:archivers/zstd \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libhiredis.so:databases/hiredis
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf compiler:c++11-lang cpe gmake ldap libtool localbase \
 		lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl
 
-SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall
+SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall pkg-message
 SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh \
 		httpdocs/misc/ntopng-utils-manage-config.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ndpi-includes=${LOCALBASE}/include/ndpi
 
 USERS=		ntopng
 GROUPS=		ntopng
 PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
 GH_TUPLE=	ntop:ntopng-dist:535c490:dist/httpdocs/dist
 GH_ACCOUNT=	ntop
 GH_TAGNAME=	a4917fa
 
 CPE_VENDOR=	ntop
 
 OPTIONS_DEFINE=	NLS
 
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 USE_RC_SUBR=	ntopng
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/configure.ac.in
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
 	${MKDIR} ${STAGEDIR}/var/db/ntopng
 	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoip2update.sh ${STAGEDIR}${PREFIX}/bin
 	${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates \
 		${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates.in
 
 .include <bsd.port.mk>
diff --git a/net/ntopng/files/ntopng-geoip2update.sh.in b/net/ntopng/files/ntopng-geoip2update.sh.in
index 1b0302d67856..3d3404647abe 100644
--- a/net/ntopng/files/ntopng-geoip2update.sh.in
+++ b/net/ntopng/files/ntopng-geoip2update.sh.in
@@ -1,44 +1,47 @@
 #!/bin/sh
 
 set -eu
 mkdir -p "%%DATADIR%%/httpdocs/geoip"
 
 TEMPDIR="$(mktemp -d "%%DATADIR%%/httpdocs/geoip/MMDB-XXXXXX")"
 trap 'rc=$? ; set +e ; rm -rf "'"$TEMPDIR"'" ; exit $rc' 0
 
 cd "${TEMPDIR}"
 
 # arguments:
 # $1 URL
 # $2 filename
 _fetchextract() {
 	url="$1"
 	file="$(basename "${url}")"
 
 	if fetch "${url}"; then
 		tar xzf "${file}"
 	else
 		echo "${file} download failed"
 		return 1
 	fi
 
 	return 0
 }
 
+# Get the license key from the GeoIP.conf file
+LICENSE_KEY=$(awk -F ' ' '/^#/ {next} $1=="LicenseKey" {print $2}' %%LOCALBASE%%/etc/GeoIP.conf)
+
 echo Fetching GeoLite2-City
-_fetchextract 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz' 
+_fetchextract "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=${LICENSE_KEY}&suffix=tar.gz"
 
 echo Fetching GeoLite2-ASN
-_fetchextract 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz'
+_fetchextract "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=${LICENSE_KEY}&suffix=tar.gz"
 
 mv GeoLite2-*/*.mmdb %%DATADIR%%/httpdocs/geoip
 
 cd %%DATADIR%%/httpdocs/geoip
 rm -rf "${TEMPDIR}"
 
 chown root:wheel *.mmdb
 chmod 444 *.mmdb
 
 trap - 0
 
 return 0
diff --git a/net/ntopng/pkg-message b/net/ntopng/files/pkg-message.in
similarity index 83%
rename from net/ntopng/pkg-message
rename to net/ntopng/files/pkg-message.in
index f3c46a612b40..02cc4fc9be53 100644
--- a/net/ntopng/pkg-message
+++ b/net/ntopng/files/pkg-message.in
@@ -1,21 +1,22 @@
 [
 { type: install
   message: <<EOM
 ntopng runs a web interface service by default, it is suggested to protect
 such network accessible services with packet filters or TCP wrappers.
 
 ntopng requires to connect to a redis server to work. Please install redis
 server from databases/redis or use -r option via ntopng_flags to specify a
 remote one.
 
 ntopng supports IP geolocation, to enable this you should use the
 ntopng-geoip2update.sh script to update the maxminddb geolocation
-data to the latest version.
+data to the latest version. This script requires a maxmind.com
+account API key configured in %%LOCALBASE%%/etc/GeoIP.conf to work.
 
 To pass a configuration file to ntopng, which overrides any command
 line arguments, add something like the following to rc.conf:
 
 ntopng_flags="/path/to/file.conf"
 EOM
 }
 ]