diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index bb6603336183..4892708d9439 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	activemq
-DISTVERSION=	6.2.9
+DISTVERSION=	6.3.1
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${DISTVERSION}
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-bin
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Messaging and Integration Patterns provider
 WWW=		https://activemq.apache.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe java
 CPE_VENDOR=	apache
 JAVA_VERSION=	17+
 USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		AMQUSER=${USERS:[1]} \
 		AMQGROUP=${GROUPS:[1]}
 
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${DISTVERSION}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PLIST_SUB=	AMQUSER=${USERS:[1]} \
 		AMQGROUP=${GROUPS:[1]}
 
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${REINPLACE_CMD} -i '' -e 's|$${sys:activemq.data}/audit.log|$${sys:activemq.logs}/audit.log|g; \
 			s|$${sys:activemq.data}/activemq.log|$${sys:activemq.logs}/activemq.log|g' \
 		${WRKSRC}/conf/log4j2.properties
-	${MKDIR} ${STAGEDIR}${ETCDIR} \
+	${MKDIR} ${STAGEDIR}${ETCDIR}/jetty \
 		 ${STAGEDIR}${DATADIR}/bin \
 		 ${STAGEDIR}/var/db/${PORTNAME}
-	cd ${WRKSRC}/conf && for f in *; do \
+	cd ${WRKSRC}/conf && for f in *.* jetty/*; do \
 		${INSTALL_DATA} ${WRKSRC}/conf/$$f ${STAGEDIR}${ETCDIR}/$$f.sample; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/activemq* ${STAGEDIR}${DATADIR}/bin
 	${RLN} ${STAGEDIR}${DATADIR}/bin/activemq ${STAGEDIR}${PREFIX}/bin
 	${RLN} ${STAGEDIR}${DATADIR}/bin/activemq-diag ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/activemq.jar ${WRKSRC}/bin/wrapper.jar \
 		${STAGEDIR}${DATADIR}/bin
 	${RLN} ${STAGEDIR}/var/db/activemq ${STAGEDIR}${DATADIR}/data
 	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "lib webapps webapps-demo" ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 	${RLN} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
 
 do-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	${RLN} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 .include <bsd.port.mk>
diff --git a/net/activemq/distinfo b/net/activemq/distinfo
index c72ee51b22e7..7fc7ab34fdb9 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1786666666
-SHA256 (apache-activemq-6.2.9-bin.tar.gz) = e983268db8513d0439ce0c41fa6f1969e8ab935a747190ae6dcdac48a687bb9a
-SIZE (apache-activemq-6.2.9-bin.tar.gz) = 55740616
+SHA256 (apache-activemq-6.3.1-bin.tar.gz) = 25350d3f9462e4297aeb1d1196443995e68e1fb7707a250fa2b7619db478daba
+SIZE (apache-activemq-6.3.1-bin.tar.gz) = 56886491
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index 0926c7b27b6f..b5c56f8fb942 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -1,22 +1,43 @@
 bin/activemq
 bin/activemq-diag
 @owner %%AMQUSER%%
 @group %%AMQGROUP%%
 @sample %%ETCDIR%%/activemq.xml.sample
 @sample %%ETCDIR%%/broker.ks.sample
 @sample %%ETCDIR%%/broker.ts.sample
 @sample %%ETCDIR%%/credentials-enc.properties.sample
 @sample %%ETCDIR%%/credentials.properties.sample
 @sample %%ETCDIR%%/groups.properties.sample
 @sample %%ETCDIR%%/java.security.sample
-@sample %%ETCDIR%%/jetty.xml.sample
+@sample %%ETCDIR%%/jetty-keystore.ks.sample
+@sample %%ETCDIR%%/jetty-spring.properties.sample
+@sample %%ETCDIR%%/jetty-spring.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-bytebufferpool.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-connection-limit.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-dos.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-http-config.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-http.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-https.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-min-data-rate.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-network-connection-limit.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-requestlog.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-scheduler.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-secure-redirect.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-security.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-size-limit.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-ssl-context.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-ssl.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-thread-limit.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-threadpool.xml.sample
+@sample %%ETCDIR%%/jetty/jetty-webapps.xml.sample
+@sample %%ETCDIR%%/jetty/jetty.xml.sample
 @sample %%ETCDIR%%/jmx.access.sample
 @sample %%ETCDIR%%/jmx.password.sample
 @sample %%ETCDIR%%/jolokia-access.xml.sample
 @sample %%ETCDIR%%/log4j2.properties.sample
 @sample %%ETCDIR%%/logging.properties.sample
 @sample %%ETCDIR%%/login.config.sample
 @sample %%ETCDIR%%/users.properties.sample
 @dir(,,0750) /var/db/activemq
 @group
 @owner