diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index f8331189dd18..2a26c16c8b36 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -1,43 +1,43 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 
 PORTNAME=	babl
 PORTVERSION=	0.1.92
 CATEGORIES=	x11
 MASTER_SITES=	GIMP
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dynamic pixel format conversion library
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
 USES=		compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz
 
 USE_LDCONFIG=	yes
 USE_GNOME=	introspection:build
 
 OPTIONS_DEFINE=	SIMD
 OPTIONS_DEFAULT=SIMD
 
 SIMD_MESON_OFF=	-Denable-mmx=false -Denable-sse=false \
 		-Denable-sse2=false -Denable-sse4_1=false \
 		-Denable-avx2=false -Denable-f16c=false
 
 BABL_SHLIB=	0.191.1
 BABL_VER=	0.1
 PLIST_SUB+=	BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64="" AARCH64="@comment "
-.elif ${ARCH} == "aarch64"
-PLIST_SUB+=	AMD64="@comment " AARCH64=""
+PLIST_SUB+=	AMD64="" ARM="@comment "
+.elif ${ARCH} == "armv6" || ${ARCH} == "armv7"
+PLIST_SUB+=	AMD64="@comment " ARM=""
 .else
-PLIST_SUB+=	AMD64="@comment " AARCH64="@comment "
+PLIST_SUB+=	AMD64="@comment " ARM="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist
index 695f67c93a1c..5fec613055d9 100644
--- a/x11/babl/pkg-plist
+++ b/x11/babl/pkg-plist
@@ -1,78 +1,78 @@
 include/babl-%%BABL_VER%%/babl/babl-introspect.h
 include/babl-%%BABL_VER%%/babl/babl-macros.h
 include/babl-%%BABL_VER%%/babl/babl-types.h
 include/babl-%%BABL_VER%%/babl/babl-version.h
 include/babl-%%BABL_VER%%/babl/babl.h
 lib/babl-%%BABL_VER%%/CIE.so
 lib/babl-%%BABL_VER%%/HCY.so
 lib/babl-%%BABL_VER%%/HSL.so
 lib/babl-%%BABL_VER%%/HSV.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-CIE.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-cairo.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-double.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-float.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gegl-fixups.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gggl-lies.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gggl.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-grey.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-simple.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-u16.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-u32.so
-%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-ycbcr.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-CIE.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-cairo.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-double.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-float.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gegl-fixups.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gggl-lies.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gggl.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-grey.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-simple.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-u16.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-u32.so
+%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-ycbcr.so
 lib/babl-%%BABL_VER%%/avx2-int8.so
 lib/babl-%%BABL_VER%%/cairo.so
 lib/babl-%%BABL_VER%%/double.so
 lib/babl-%%BABL_VER%%/fast-float.so
 lib/babl-%%BABL_VER%%/float.so
 lib/babl-%%BABL_VER%%/gegl-fixups.so
 lib/babl-%%BABL_VER%%/gggl-lies.so
 lib/babl-%%BABL_VER%%/gggl-table-lies.so
 lib/babl-%%BABL_VER%%/gggl-table.so
 lib/babl-%%BABL_VER%%/gggl.so
 lib/babl-%%BABL_VER%%/gimp-8bit.so
 lib/babl-%%BABL_VER%%/grey.so
 lib/babl-%%BABL_VER%%/half.so
 lib/babl-%%BABL_VER%%/naive-CMYK.so
 lib/babl-%%BABL_VER%%/oklab.so
 lib/babl-%%BABL_VER%%/simple.so
 lib/babl-%%BABL_VER%%/sse-half.so
 lib/babl-%%BABL_VER%%/sse2-float.so
 lib/babl-%%BABL_VER%%/sse2-int16.so
 lib/babl-%%BABL_VER%%/sse2-int8.so
 lib/babl-%%BABL_VER%%/sse4-int8.so
 lib/babl-%%BABL_VER%%/two-table.so
 lib/babl-%%BABL_VER%%/u16.so
 lib/babl-%%BABL_VER%%/u32.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-CIE.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-cairo.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-double.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-float.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-gegl-fixups.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-gggl-lies.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-gggl.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-grey.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-simple.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-u16.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-u32.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v2-ycbcr.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-CIE.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-cairo.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-double.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-float.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-gegl-fixups.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-gggl-lies.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-gggl.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-grey.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-simple.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-u16.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-u32.so
 %%AMD64%%lib/babl-%%BABL_VER%%/x86-64-v3-ycbcr.so
 lib/babl-%%BABL_VER%%/ycbcr.so
 lib/girepository-1.0/Babl-%%BABL_VER%%.typelib
 lib/libbabl-%%BABL_VER%%.so
 lib/libbabl-%%BABL_VER%%.so.0
 lib/libbabl-%%BABL_VER%%.so.%%BABL_SHLIB%%
 libdata/pkgconfig/babl.pc
 share/gir-1.0/Babl-%%BABL_VER%%.gir
 share/vala/vapi/babl-%%BABL_VER%%.deps
 share/vala/vapi/babl-%%BABL_VER%%.vapi