diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 1449e4127607..57db3e046105 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	apache-solr
-PORTVERSION=	9.5.0
+PORTVERSION=	9.6.0
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
 DISTNAME=	solr-${PORTVERSION}
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	High performance search server built using Lucene Java
 WWW=		https://lucene.apache.org/solr/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe tar:tgz
 CPE_VENDOR=	apache
 CPE_PRODUCT=	solr
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 JAVA_RUN=	yes
 USE_RC_SUBR=	solr
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
 USERS=		solr
 GROUPS=		${USERS}
 
 CPE_PRODUCT=	solr
 CPE_VENDOR=	apache
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	JTS
 OPTIONS_SUB=	yes
 
 JTS_DESC=	Enable support for JTS Topology Suite
 JTS_RUN_DEPENDS=	jts>0:math/jts
 
 do-install:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/post ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/postlogs ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/solr.in.sh ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} '' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} 'SOLR_HOME="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} '# LOG4J_PROPS="/var/db/solr/log4j2.xml"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} 'SOLR_LOGS_DIR="/var/log/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} 'SOLR_PORT="8983"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} 'SOLR_PID_DIR="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} 'SOLR_OPTS="$$SOLR_OPTS -Djetty.host=localhost -Dlog4j2.formatMsgNoLookups=true"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 
 	${MKDIR} ${STAGEDIR}/var/db/solr
 	${MKDIR} ${STAGEDIR}/var/log/solr
 	${INSTALL_DATA} ${WRKSRC}/server/solr/solr.xml ${STAGEDIR}/var/db/solr/solr.xml.sample
 
 do-install-JTS-on:
 	${LN} -sf ${JAVALIBDIR}/jts-core.jar ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/server/solr-webapp/webapp/WEB-INF/lib/
 
 post-install:
 	${FIND} -s ${STAGEDIR}${PREFIX}/${CPE_PRODUCT} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(solr,solr) /var/db/solr" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(solr,solr) /var/log/solr" >> ${TMPPLIST}
 	@${ECHO_CMD} "@sample etc/solr.in.sh.sample" >> ${TMPPLIST}
 	@${ECHO_CMD} "@sample(solr,solr) /var/db/solr/solr.xml.sample" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index ce6d60fb1b22..a137b22867af 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708241893
-SHA256 (solr-9.5.0.tgz) = d8538502019af1945e0b124a4613b46ca43aedcf3f20e9912c482c080407ea21
-SIZE (solr-9.5.0.tgz) = 281474369
+TIMESTAMP = 1714540868
+SHA256 (solr-9.6.0.tgz) = 39ec04e45bb0a911cee6e4355a416e0ee25e1cc39f5316a3a654985a85a8ed32
+SIZE (solr-9.6.0.tgz) = 282419640