diff --git a/textproc/apache-solr9/Makefile b/textproc/apache-solr9/Makefile
index fb41a287b8b8..23be209eeba8 100644
--- a/textproc/apache-solr9/Makefile
+++ b/textproc/apache-solr9/Makefile
@@ -1,71 +1,70 @@
 PORTNAME=	apache-solr
-PORTVERSION=	9.1.1
+PORTVERSION=	9.2.0
 PORTREVISION=	0
 CATEGORIES=	textproc java
 MASTER_SITES=	https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
 DISTNAME=	solr-${PORTVERSION}
 PKGNAMESUFFIX=	9
 
 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}
 
 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/oom_solr.sh ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
 	${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} '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-solr9/distinfo b/textproc/apache-solr9/distinfo
index 157bdf0ee4a8..1072d03ea14c 100644
--- a/textproc/apache-solr9/distinfo
+++ b/textproc/apache-solr9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676718132
-SHA256 (solr-9.1.1.tgz) = 3d66aadb0afa69360da05a9124e7724539c7d5e41adecb7a736921baf6b97575
-SIZE (solr-9.1.1.tgz) = 229955064
+TIMESTAMP = 1682234904
+SHA256 (solr-9.2.0.tgz) = 8b134a13a3e7598f68565b01e755a47e24b37a88141cd2f489fc2812c96f21af
+SIZE (solr-9.2.0.tgz) = 278193419
diff --git a/textproc/apache-solr9/files/patch-bin_solr b/textproc/apache-solr9/files/patch-bin_solr
deleted file mode 100644
index 1c15691df53e..000000000000
--- a/textproc/apache-solr9/files/patch-bin_solr
+++ /dev/null
@@ -1,31 +0,0 @@
---- bin/solr.orig	2022-04-25 20:37:26 UTC
-+++ bin/solr
-@@ -2269,13 +2269,12 @@ function start_solr() {
- 	echo ""
-     fi
-     # no lsof on cygwin though
--    if lsof -v 2>&1 | grep -q revision; then
-       echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT"
-       # Launch in a subshell to show the spinner
-       (loops=0
-       while true
-       do
--        running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN || :)
-+        running=$(sockstat -ls -P tcp -p $SOLR_PORT | grep LISTEN)
-         if [ -z "${running:-}" ]; then
-           slept=$((loops * 2))
-           if [ $slept -lt $SOLR_START_WAIT ]; then
-@@ -2293,13 +2292,6 @@ function start_solr() {
-         fi
-       done) &
-       spinner $!
--    else
--      echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT."
--      sleep 10
--      SOLR_PID=`ps auxww | grep start\.jar | awk "/\-Djetty\.port=$SOLR_PORT/"' {print $2}' | sort -r`
--      echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
--      return;
--    fi
-   fi
- }
- 
diff --git a/textproc/apache-solr9/files/pkg-message.in b/textproc/apache-solr9/files/pkg-message.in
index 4ff8a03f0ec2..bfbc748d17b9 100644
--- a/textproc/apache-solr9/files/pkg-message.in
+++ b/textproc/apache-solr9/files/pkg-message.in
@@ -1,45 +1,49 @@
 [
 { type: install
   message: <<EOM
 Make sure to edit the following files to adapt to your setup:
 
 %%LOCALBASE%%/etc/solr.in.sh
 /var/db/solr/solr.xml
 
 All files are configured to have your solr instances running in
 /var/db/solr/<instancename>
 
 For more information how to configure solr check the manual:
 http://lucene.apache.org/solr/resources.html#documentation
 
 The port is configured to listen only on localhost, port 8983.
 
 To rotate solr log files include /var/log/solr/ to your log rotation
 configuration.
 
 To enable the port execute:
 sysrc solr_enable="YES"
 
 And start it with:
 service solr start
 EOM
 }
 { type: upgrade
   message: <<EOM
 If you update, make sure you update your %%LOCALBASE%%/etc/solr.in.sh
 The LOG4J_PROPS has changed.
 If you would like to change logging, copy:
 cp %%LOCALBASE%%/solr/server/resources/log4j2.xml /var/db/solr/
 Change it and make sure it is loaded in %%LOCALBASE%%/etc/solr.in.sh.
 
 Data Import Handler (DIH) has been removed from the base solr and is
 available as independent module which can be installed with solr
 package manager. The current repo is available at:
 https://github.com/rohitbemax/dataimporthandler
 
 Make also sure to always check the manual if you need to modify your
 configs or schemas:
 https://solr.apache.org/guide/9_0/solr-upgrade-notes.html
+
+Maybe you want also to check some examples:
+https://dovecot.org/pipermail/dovecot/2022-May/124701.html
+https://dovecot.org/pipermail/dovecot/2022-May/124711.html
 EOM
 }
 ]