diff --git a/security/klee/Makefile b/security/klee/Makefile
index effce070f48e..4993a09f7315 100644
--- a/security/klee/Makefile
+++ b/security/klee/Makefile
@@ -1,50 +1,60 @@
 PORTNAME=	klee
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3
 CATEGORIES=	security devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Symbolic virtual machine built on top of LLVM
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 NOT_FOR_ARCHS=	i386
 
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		gmake:devel/gmake
 # Should be a LIB_DEPEND, but hard to express in a generic manner
 RUN_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang localbase pkgconfig python:3.5+,run \
 		shebangfix sqlite
 USE_GITHUB=	yes
 SHEBANG_FILES=	tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool tools/klee-zesti/klee-zesti
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	ENABLE_POSIX_RUNTIME ENABLE_UNIT_TESTS ENABLE_SYSTEM_TESTS
 CMAKE_ARGS=	-DLLVM_CONFIG_BINARY=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
 		-DMAKE_BINARY=${LOCALBASE}/bin/gmake
 
 # TODO METASMT
 OPTIONS_DEFINE=		TCMALLOC
 OPTIONS_DEFAULT=	TCMALLOC Z3 STP
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	Z3 STP
 
 TCMALLOC_DESC=		Use tcmalloc library for memory management
 TCMALLOC_CMAKE_BOOL=	ENABLE_TCMALLOC
 TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
 Z3_DESC=		Enable Z3 SMT solver
 Z3_CMAKE_BOOL=		ENABLE_SOLVER_Z3
 Z3_BUILD_DEPENDS=	z3:math/z3
 Z3_RUN_DEPENDS=		z3:math/z3
 
 STP_DESC=		Enable STP SMT solver
 STP_CMAKE_BOOL=		ENABLE_SOLVER_STP
 STP_LIB_DEPENDS=	libstp.so:math/stp \
 			libcryptominisat5.so:math/cryptominisat
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64le
+PLIST_SUB=	32BIT="@comment " \
+		64BIT=""
+.else
+PLIST_SUB=	32BIT="" \
+		64BIT=""
+.endif
+
 .include <bsd.port.mk>
diff --git a/security/klee/pkg-plist b/security/klee/pkg-plist
index 8e0ae5be1e93..4110da8a62da 100644
--- a/security/klee/pkg-plist
+++ b/security/klee/pkg-plist
@@ -1,59 +1,59 @@
 bin/gen-bout
 bin/gen-random-bout
 bin/kleaver
 bin/klee
 bin/klee-replay
 bin/klee-stats
 bin/klee-zesti
 bin/ktest-tool
 include/klee/klee.h
-lib/klee/runtime/libkleeRuntimeFortify32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Debug.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Debug.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Debug.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Debug.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Debug.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Debug.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Release.bca
 lib/libkleeRuntest.so
 lib/libkleeRuntest.so.1.0