diff --git a/security/john/Makefile b/security/john/Makefile
index d8f42867e842..124e5cda60c3 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,98 +1,97 @@
 PORTNAME=	john
 # NB: starting from the next version, community-enhanced (jumbo) patch
 # should be offered as an option (suggested by Solar Designer himself).
 DISTVERSION=	1.9.0-jumbo-1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/j/ \
 		http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
 		http://distro.ibiblio.org/openwall/projects/john/${DISTVERSION:C/-.*//}/
 PATCH_STRIP=	-p2
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Featureful Unix password cracker
 WWW=		https://www.openwall.com/john/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake shebangfix ssl tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS_EXTRA="-DJOHN_SYSTEMWIDE=1" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 SHEBANG_FILES=	../run/*.pl ../run/*.rb ../run/benchmark-unify ../run/relbench
 WRKSRC_SUBDIR=	src
 ALL_TARGET=	default
 
 BINARIES=	SIPdump bitlocker2john calc_stat cprepair dmg2john \
 		eapmd5tojohn genmkvpwd hccap2john john keepass2john \
 		mkvcalcproba putty2john racf2john raw2dyna tgtsnarf \
 		uaf2john vncpcap2john wpapcap2john
 
 BINLINKS=	base64conv gpg2john rar2john unafs undrop unique \
 		unshadow zip2john
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS OPENCL OPENMP OPENMPI
 OPTIONS_DEFAULT=	OPENMP
 OPTIONS_SUB=	yes
 
 OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 OPENCL_CONFIGURE_OFF=	--disable-opencl
 OPENCL_USES=		perl5
 OPENCL_USE=		PERL5=build
 
 OPENMP_CONFIGURE_OFF=	--disable-openmp
 
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 OPENMPI_CONFIGURE_ON=	--enable-mpi
 OPENMPI_CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/mpi/openmpi/include" \
 			LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib"
 
-CFLAGS_powerpc64=	-mvsx
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h
 	@${REINPLACE_CMD} -e '/^host_cpu=/s|$$| ; case $$host_cpu in\
 		amd64) host_cpu=x86_64 ;; esac|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,^#ifdef __linux,#ifndef __APPLE,' \
 		${WRKSRC}/DES_bs_b.c
 
 do-install:
 .for b in ${BINARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/../run/${b} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for l in ${BINLINKS}
 	${LN} -sf john ${STAGEDIR}${PREFIX}/bin/${l}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/extra
 	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.chr *.conf *.lst \
 		${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.?? *.lua benchmark-unify \
 		dictionary.rfc2865 fuzz.dic john.*sh_completion mailer \
 		makechr oui.txt relbench stats ${STAGEDIR}${DATADIR}/extra
 	${CP} -a ${WRKSRC}/../run/rules ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/../run && ${CP} -a dns lib ztex \
 		${STAGEDIR}${DATADIR}/extra
 	@${RM} ${STAGEDIR}${DATADIR}/extra/dns/README.txt
 
 do-install-OPENCL-on:
 	${CP} -a ${WRKSRC}/../run/kernels ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${WRKSRC}/../doc/extras/* ${WRKSRC}/../*.md ${WRKSRC}/../doc
 	@${RMDIR} ${WRKSRC}/../doc/extras
 	@${RM} ${WRKSRC}/../doc/COPYING ${WRKSRC}/../doc/README
 	${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
 
 .if defined(PACKAGE_BUILDING) || defined(BATCH)
 .  if ${ARCH} == amd64 || ${ARCH} == i386
 CONFIGURE_ARGS+=	--enable-simd=sse2
 .  endif
 .endif
diff --git a/security/john/files/patch-git-2e74ecd b/security/john/files/patch-git-2e74ecd
new file mode 100644
index 000000000000..800592419556
--- /dev/null
+++ b/security/john/files/patch-git-2e74ecd
@@ -0,0 +1,31 @@
+From 2e74ecd4da1624b78d07eddaaa1074fc584928d0 Mon Sep 17 00:00:00 2001
+From: pkubaj <pkubaj@FreeBSD.org>
+Date: Tue, 21 Feb 2023 16:44:44 +0000
+Subject: [PATCH] Fix build on powerpc64 by not including dynamic.h
+
+Fixes https://github.com/openwall/john/issues/5231
+---
+ src/john.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/john.c b/src/john.c
+index 75463966ea..70ef8b4ceb 100644
+--- a/src/john.c
++++ b/src/john.c
+@@ -106,7 +106,6 @@ static int john_omp_threads_new;
+ #include "subsets.h"
+ #include "external.h"
+ #include "batch.h"
+-#include "dynamic.h"
+ #include "dynamic_compiler.h"
+ #include "fake_salts.h"
+ #include "listconf.h"
+@@ -141,6 +140,8 @@ static int john_omp_threads_new;
+ #endif
+ #include "omp_autotune.h"
+ 
++extern int dynamic_Register_formats(struct fmt_main **ptr);
++	
+ #if CPU_DETECT
+ extern int CPU_detect(void);
+ extern char CPU_req_name[];