diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index f54e3c543250..7ec808e00fb5 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,76 +1,77 @@
 PORTNAME=	zaproxy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.13.0
+PORTREVISION=	1
 CATEGORIES=	security java
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The OWASP zed attack proxy
 WWW=		https://www.zaproxy.org/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	gradle:devel/gradle
 
 USES=		gettext-runtime
 USE_JAVA=	yes
 
 USE_GITHUB=	yes
 
 JAVA_VERSION=	11
 
 NO_ARCH=	yes
 
 MAKE_ENV+=	GRADLE_USER_HOME=${WRKDIR}
 
 DESKTOP_ENTRIES="ZAP" "OWASP ZAP" "${PREFIX}/share/pixmaps/zaproxy.png" "${PORTNAME}" \
 		"System;Security;" true
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps archive
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 DEPS_CACHE_DIR=	${WRKDIR}
 EXCLUDE_TASK=	--exclude-task :zap:downloadMainAddOns
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 .if (${DEV_UPDATE_MODE} == "yes")
 EXCLUDE_TASK=	#
 post-build:
 	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} gradle-${PORTNAME}
 	@cd ${WRKSRC}/zap/build && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX} mainAddOns
 	@${ECHO} "(!!!) Please upload the deps archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 	@${ECHO} "(!!!) Please upload the plugins archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/${PORTNAME}:deps
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:deps \
 		${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX}:deps
 GRADLE_ARGS=	--offline
 
 post-extract: # need a separate extract step because the cache is in /tmp, and not under work/ like with maven
 	@cd ${DEPS_CACHE_DIR} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \
 		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|g' \
 		-e 's|%%VERSION%%|${DISTVERSION}|g' ${WRKSRC}/zap/src/main/dist/zap.sh
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
 		--gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \
 		${GRADLE_ARGS} --build-cache :zap:distCore ${EXCLUDE_TASK}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/zap/build/distFiles/zap.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	cd ${WRKSRC}/zap/build/distFiles/ && ${COPYTREE_SHARE} "db lang lib license plugin README scripts xml zap-${DISTVERSION}.jar" ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 	cd ${WRKDIR}/mainAddOns && ${COPYTREE_SHARE} ./ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugin
 	${INSTALL_DATA} ${WRKSRC}/zap/src/main/resources/resource/zap64x64.png ${STAGEDIR}${PREFIX}/share/pixmaps/zaproxy.png
 
 .include <bsd.port.mk>
diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo
index 0e4dcfc0c9f1..0f7619532139 100644
--- a/security/zaproxy/distinfo
+++ b/security/zaproxy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1689211847
-SHA256 (zaproxy-2.13.0-deps.tar.gz) = f90f508c652b90d57da9d336b4f9ef6a58c726ea43ca25be96473b24576591c3
-SIZE (zaproxy-2.13.0-deps.tar.gz) = 327651575
-SHA256 (zaproxy-2.13.0-plugins.tar.gz) = d55d3580d0022a4e8ad66d10c76053c925755fd549c9372136bb754fe1c1f23d
-SIZE (zaproxy-2.13.0-plugins.tar.gz) = 213023713
+TIMESTAMP = 1695075246
+SHA256 (zaproxy-2.13.0-deps.tar.gz) = 0d5f6b81df4c5b4ca15fa6d93f304e601ed6cabbbc2c6f23bb011f5c7725a9c2
+SIZE (zaproxy-2.13.0-deps.tar.gz) = 322264036
+SHA256 (zaproxy-2.13.0-plugins.tar.gz) = 51bc71c13c9e4af87ef82d2a93d1671c7a5feade4d06539f0328827131402484
+SIZE (zaproxy-2.13.0-plugins.tar.gz) = 213024343
 SHA256 (zaproxy-zaproxy-v2.13.0_GH0.tar.gz) = c3df2d1ea80174955249b5c26208ec4019cf047633fe826a166b2e8b311a0092
 SIZE (zaproxy-zaproxy-v2.13.0_GH0.tar.gz) = 7473060
diff --git a/security/zaproxy/files/patch-zap-src-main-dist_zap.sh b/security/zaproxy/files/patch-zap-src-main-dist_zap.sh
index e42610bc36aa..7bcd12e8c3bc 100644
--- a/security/zaproxy/files/patch-zap-src-main-dist_zap.sh
+++ b/security/zaproxy/files/patch-zap-src-main-dist_zap.sh
@@ -1,69 +1,78 @@
---- zap/src/main/dist/zap.sh	2022-10-27 07:53:05.000000000 -0500
-+++ zap/src/main/dist/zap.sh	2022-10-31 18:52:02.376240000 -0500
+--- zap/src/main/dist/zap.sh	2023-07-11 09:00:57.000000000 -0500
++++ zap/src/main/dist/zap.sh	2023-09-18 17:22:08.753719000 -0500
 @@ -1,18 +1,7 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
  
 -# Dereference from link to the real directory
 -SCRIPTNAME="$0"
 +BASEDIR="%%JAVAJARDIR%%/zaproxy"
  
 -# While name of this script is symbolic link
 -while [ -L "${SCRIPTNAME}" ] ; do
 -  cd "`dirname "${SCRIPTNAME}"`" > /dev/null
 -  SCRIPTNAME="$(readlink "`basename "${SCRIPTNAME}"`")"
 -done
 -cd "`dirname "${SCRIPTNAME}"`" > /dev/null
 -
 -# Base directory where ZAP is installed
 -BASEDIR="`pwd -P`"
 -
  # Switch to the directory where ZAP is installed
  cd "$BASEDIR"
  
 @@ -31,7 +20,7 @@
  fi
  
  # Extract and check the Java version
 -JAVA_OUTPUT=$(java -version 2>&1)
 +JAVA_OUTPUT=$(%%JAVA_HOME%%/bin/java -version 2>&1)
  
  # Catch warning: Unable to find a $JAVA_HOME at "/usr", continuing with system-provided Java
  if [ "`echo ${JAVA_OUTPUT} | grep "continuing with system-provided Java"`" ] ; then
 @@ -43,7 +32,7 @@
  
  DEFAULTJAVAGC=""
  
 -JAVA_VERSION=$(java -version 2>&1 | awk -F\" '/version/ { print $2 }')
 +JAVA_VERSION=$(%%JAVA_HOME%%/bin/java -version 2>&1 | awk -F\" '/version/ { print $2 }')
  JAVA_MAJOR_VERSION=${JAVA_VERSION%%[.|-]*}
  JAVA_MINOR_VERSION=$(echo $JAVA_VERSION | awk -F\. '{ print $2 }')
  
-@@ -90,7 +79,7 @@
+@@ -90,21 +79,21 @@
    fi
  fi
  
 -ARGS=()
 +ARGS=""
  for var in "$@"; do
-   if [[ "$var" == -Xmx* ]]; then
+-  if [[ "$var" == -Xmx* ]]; then
++  if [ "$var" == -Xmx* ]; then
      # Overridden by the user
-@@ -104,7 +93,7 @@
-   elif [[ $var != -psn_* ]]; then
+     JMEM="$var"
+-  elif [[ $var == --jvmdebug* ]]; then
++  elif [ $var == --jvmdebug* ]; then
+ 	JAVADEBUGPORT=`echo "$var" | sed -e "s/--jvmdebug//g" | sed -e "s/=//g"`
+ 	if [ ! "$JAVADEBUGPORT" ]; then
+ 		JAVADEBUGPORT=1044
+ 	fi
+ 	JAVADEBUG="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=127.0.0.1:$JAVADEBUGPORT"
+-  elif [[ $var != -psn_* ]]; then
++  elif [ $var != -psn_* ]; then
      # Strip the automatic -psn_x_xxxxxxx argument that OS X automatically passes into apps, since
      # it freaks out ZAP
 -    ARGS+=("$var")
 +    ARGS=${ARGS}" ${var}"
    fi
  done
  
 @@ -121,7 +110,7 @@
  # Start ZAP; it's likely that -Xdock:icon would be ignored on other platforms, but this is known to work
  if [ "$OS" = "Darwin" ]; then
    # It's likely that -Xdock:icon would be ignored on other platforms, but this is known to work
 -  exec java ${JMEM} ${JAVAGC} ${JAVADEBUG} -Xdock:icon="../Resources/ZAP.icns" -jar "${BASEDIR}/@zapJar@" "${ARGS[@]}"
 +  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} -Xdock:icon="../Resources/ZAP.icns" -jar "${BASEDIR}/zap-2.11.0.jar" "${ARGS[@]}"
  else
 -  exec java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "${BASEDIR}/@zapJar@" "${ARGS[@]}"
-+  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "zap-%%VERSION%%.jar" "${ARGS}"
++  %%JAVA_HOME%%/bin/java ${JMEM} ${JAVAGC} ${JAVADEBUG} -jar "zap-%%VERSION%%.jar" ${ARGS}
  fi