diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile
index 590cb21d1238..e932002e3066 100644
--- a/devel/llvm80/Makefile
+++ b/devel/llvm80/Makefile
@@ -55,10 +55,10 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
+OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
-OPTIONS_DEFAULT=	BE_STANDARD CLANG EXTRAS LIT LLD LLDB
+OPTIONS_DEFAULT=	BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_SINGLE=		BACKENDS
@@ -114,6 +114,10 @@ LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
+PYCLANG_DESC=  Install python bindings to libclang
+PYCLANG_IMPLIES=       CLANG
+PYCLANG_VARS=  _USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
diff --git a/devel/llvm80/pkg-plist b/devel/llvm80/pkg-plist
index 01605b02ed81..ab6419120438 100644
--- a/devel/llvm80/pkg-plist
+++ b/devel/llvm80/pkg-plist
@@ -3009,6 +3009,9 @@ llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR%%
 %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldbUtilityHelpers.a
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so
+%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/__init__.py
+%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/cindex.py
+%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/enumerations.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/c++-analyzer
 %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/ccc-analyzer
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/bash-autocomplete.sh
diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
index 49eb9322f6ca..4ffd28aa8245 100644
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@@ -66,10 +66,10 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
-OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB
+OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_SINGLE=		BACKENDS
@@ -125,6 +125,10 @@ LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
+PYCLANG_DESC=	Install python bindings to libclang
+PYCLANG_IMPLIES=	CLANG
+PYCLANG_VARS=	_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
diff --git a/devel/llvm90/pkg-plist b/devel/llvm90/pkg-plist
index 8e42470d8d67..93fe9646ac01 100644
--- a/devel/llvm90/pkg-plist
+++ b/devel/llvm90/pkg-plist
@@ -3041,6 +3041,9 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%
 %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%%
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so
+%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/__init__.py
+%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/cindex.py
+%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/enumerations.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/c++-analyzer
 %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/ccc-analyzer
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/bash-autocomplete.sh