diff --git a/net/dataplaneapi/Makefile b/net/dataplaneapi/Makefile
index 4048e1e15ec4..7d869fd5b6d5 100644
--- a/net/dataplaneapi/Makefile
+++ b/net/dataplaneapi/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	dataplaneapi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	dtxdf@FreeBSD.org
 COMMENT=	HAProxy Data Plane API
 WWW=		https://github.com/haproxytech/${PORTNAME}
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	haproxytech
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MOD_DIST=	github
 GO_MODULE=	github.com/haproxytech/${PORTNAME}
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 			-X 'main.GitRepo=https://github.com/haproxytech/${PORTNAME}' \
 			-X 'main.GitTag=${DISTVERSIONPREFIX}${DISTVERSION}' \
 			-X 'main.GitCommit=${GITID}' \
 			-X 'main.BuildTime=${BUILD_DATE}'"
 
 PLIST_FILES=	"@sample(,,640) etc/dataplaneapi.yaml.sample" \
 		bin/${PORTNAME}
 
 PORTDOCS=	CONFIG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse --short HEAD'
 # in the Data Plane API repository to get the value of GITID.
 GITID=		32af2b44
 
 BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/configuration/configuration.go
 
 post-install:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/dataplaneapi.yaml \
 		> ${STAGEDIR}${PREFIX}/etc/dataplaneapi.yaml.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/configuration/doc/README.md ${STAGEDIR}${DOCSDIR}/CONFIG.md
 
 .include <bsd.port.mk>
diff --git a/net/dataplaneapi/files/dataplaneapi.in b/net/dataplaneapi/files/dataplaneapi.in
index fb5f74c483c5..4dd4c98df3f1 100644
--- a/net/dataplaneapi/files/dataplaneapi.in
+++ b/net/dataplaneapi/files/dataplaneapi.in
@@ -1,27 +1,28 @@
 #!/bin/sh
 
 # PROVIDE: dataplaneapi
 # REQUIRE: LOGIN haproxy
 # KEYWORD: shutdown
 #
 # Configuration settings for Data Plane API in /etc/rc.conf
 #
 # dataplaneapi_enable (bool):    Enable Data Plane API. (default=NO)
 #
 
 . /etc/rc.subr
 
 name="dataplaneapi"
 desc="HAProxy Data Plane API"
 rcvar="${name}_enable"
 
 load_rc_config $name
 
 : ${dataplaneapi_enable:="NO"}
 
+dataplaneapi_env="AUTOMEMLIMIT_EXPERIMENT=system"
 pidfile="/var/run/${name}.pid"
 procname="%%LOCALBASE%%/bin/${name}"
 command="/usr/sbin/daemon"
 command_args="-c -p ${pidfile} -t \"${desc}\" ${procname}"
 
 run_rc_command "$1"