diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index 4dcf14e4560e..225355cfda44 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	activemq
-PORTVERSION=	5.16.5
+PORTVERSION=	5.17.1
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	-bin.tar.gz
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Messaging and Integration Patterns provider
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 USE_RC_SUBR=	activemq
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		activemq
 GROUPS=		activemq
 
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${RM} ${WRKSRC}/conf/log4j.properties.orig
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${WRKSRC}/conf && for f in *; do \
 		${INSTALL_DATA} ${WRKSRC}/conf/$$f ${STAGEDIR}${ETCDIR}/$$f.sample; \
 	done
 	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${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
 	@${MKDIR} ${STAGEDIR}/var/db/activemq
 	${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 14699daa17b6..ad53fe0ea229 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659508713
-SHA256 (apache-activemq-5.16.5-bin.tar.gz) = 526720fb8c5e48fe306aaf1c798475be37d38238b461b5eaf417e9007b9acc37
-SIZE (apache-activemq-5.16.5-bin.tar.gz) = 64213100
+TIMESTAMP = 1659747932
+SHA256 (apache-activemq-5.17.1-bin.tar.gz) = 617ec25102cc62252e6d9b06cc496766af116c97525255bc8c4b3e75ee9e00c8
+SIZE (apache-activemq-5.17.1-bin.tar.gz) = 48767765
diff --git a/net/activemq/files/patch-conf_log4j.properties b/net/activemq/files/patch-conf_log4j.properties
deleted file mode 100644
index 77323fdac287..000000000000
--- a/net/activemq/files/patch-conf_log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
---- conf/log4j.properties.orig	2019-03-15 12:04:19 UTC
-+++ conf/log4j.properties
-@@ -44,7 +44,7 @@ log4j.appender.console.threshold=INFO
- 
- # File appender
- log4j.appender.logfile=org.apache.log4j.RollingFileAppender
--log4j.appender.logfile.file=${activemq.data}/activemq.log
-+log4j.appender.logfile.file=${activemq.logs}/activemq.log
- log4j.appender.logfile.maxFileSize=1024KB
- log4j.appender.logfile.maxBackupIndex=5
- log4j.appender.logfile.append=true
-@@ -70,7 +70,7 @@ log4j.additivity.org.apache.activemq.audit=false
- log4j.logger.org.apache.activemq.audit=INFO, audit
- 
- log4j.appender.audit=org.apache.log4j.RollingFileAppender
--log4j.appender.audit.file=${activemq.data}/audit.log
-+log4j.appender.audit.file=${activemq.logs}/audit.log
- log4j.appender.audit.maxFileSize=1024KB
- log4j.appender.audit.maxBackupIndex=5
- log4j.appender.audit.append=true
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index 66e8446708c6..c6f32e2235f2 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -1,25 +1,23 @@
 bin/activemq
 bin/activemq-diag
 @owner activemq
 @group activemq
 @sample %%ETCDIR%%/activemq.xml.sample
-@sample %%ETCDIR%%/broker-localhost.cert.sample
 @sample %%ETCDIR%%/broker.ks.sample
 @sample %%ETCDIR%%/broker.ts.sample
-@sample %%ETCDIR%%/client.ks.sample
-@sample %%ETCDIR%%/client.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-realm.properties.sample
 @sample %%ETCDIR%%/jetty.xml.sample
 @sample %%ETCDIR%%/jmx.access.sample
 @sample %%ETCDIR%%/jmx.password.sample
-@sample %%ETCDIR%%/log4j.properties.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