diff --git a/biology/bwa/Makefile b/biology/bwa/Makefile
index a6302394411c..5075bda611bc 100644
--- a/biology/bwa/Makefile
+++ b/biology/bwa/Makefile
@@ -1,47 +1,44 @@
 PORTNAME=	bwa
 PORTVERSION=	0.7.17
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	biology
 
 PATCH_SITES=	https://github.com/lh3/bwa/commit/
 PATCHFILES=	2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch:-p1
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Burrows-Wheeler sequence aligner
 
 LICENSE=	GPLv3
 
-# From 0.7.9a: Recheck for 0.7.17.
-BROKEN_aarch64=		fails to compile: invalid conversion between vector type and integer type
-BROKEN_armv6=		fails to compile: invalid conversion between vector type and integer type
-BROKEN_armv7=		fails to compile: invalid conversion between vector type and integer type
 BROKEN_mips=		fails to compile: cc1: unrecognized command line option "-msse2"
 BROKEN_mips64=		fails to compile: cc1: unrecognized command line option "-msse2"
-BROKEN_powerpc64=	fails to compile: ksw.c: emmintrin.h: No such file or directory
-BROKEN_riscv64=		fails to compile: invalid conversion between vector type and integer type
 
-USES=		gmake perl5 shebangfix tar:bzip2
+BUILD_DEPENDS=	simde>0:devel/simde
+
+USES=		gmake localbase perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	qualfa2fq.pl xa2multi.pl
 USE_PERL5=	run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lh3
 
 PLIST_FILES=	bin/bwa bin/qualfa2fq.pl bin/xa2multi.pl man/man1/bwa.1.gz
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 # Avoid #error in emmintrin.h
 CFLAGS+=	-msse2
 .elif ${ARCH} == powerpc64le
 CFLAGS+=	-DNO_WARN_X86_INTRINSICS
 USES+=	compiler:gcc-c++11-lib
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bwa ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/biology/bwa/files/patch-ksw.c b/biology/bwa/files/patch-ksw.c
new file mode 100644
index 000000000000..c86cabf2e497
--- /dev/null
+++ b/biology/bwa/files/patch-ksw.c
@@ -0,0 +1,13 @@
+--- ksw.c.orig	2021-12-01 13:48:35 UTC
++++ ksw.c
+@@ -26,7 +26,9 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <assert.h>
+-#include <emmintrin.h>
++// #include <emmintrin.h>
++#define SIMDE_ENABLE_NATIVE_ALIASES
++#include <simde/x86/sse2.h>
+ #include "ksw.h"
+ 
+ #ifdef USE_MALLOC_WRAPPERS