diff --git a/Programming/clang/build b/Programming/clang/build
new file mode 100755
index 0000000000000000000000000000000000000000..c3a9466cb401cb0bbfcbd92077f8ce58e3984145
--- /dev/null
+++ b/Programming/clang/build
@@ -0,0 +1,24 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url \
+	"https://github.com/llvm/llvm-project/releases/download/llvmorg-${V_PKG}/llvm-project-${V_PKG}.tar.xz"
+
+#pbuild::set_sha256sum "openmpi-3.1.2.tar.bz2:c654ed847f34a278c52a15c98add40402b4a90f0c540779f1ae6c489af8a76c5"
+
+pbuild::add_to_group 'Programming'
+#pbuild::install_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
+
+
+pbuild::configure() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DLLVM_ENABLE_PROJECTS=clang \
+		-G "Unix Makefiles" \
+		../src/llvm/ \
+		|| exit 1
+}
+
+pbuild::post_install() {
+	:
+}
diff --git a/Programming/clang/files/variants.rhel6 b/Programming/clang/files/variants.rhel6
new file mode 100644
index 0000000000000000000000000000000000000000..b97cf8e0ea4aeadad6fcbf4fbafc89af36447d26
--- /dev/null
+++ b/Programming/clang/files/variants.rhel6
@@ -0,0 +1 @@
+clang/10.0.1	unstable b:cmake/3.15.5 b:gcc/8.4.0 b:Python/3.8.4
diff --git a/Programming/clang/modulefile b/Programming/clang/modulefile
new file mode 100644
index 0000000000000000000000000000000000000000..2e2b6fedab6ee6da6ac9e817cc85bf2e601ffbba
--- /dev/null
+++ b/Programming/clang/modulefile
@@ -0,0 +1,21 @@
+#%Module1.0
+
+module-whatis		"LLVM native C/C++/Objective-C compiler"
+module-url		"http://llvm.org"
+module-license		"Apache 2.0 License with LLVM exceptions"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help	"
+Clang is an \"LLVM native\" C/C++/Objective-C compiler, which aims to
+deliver amazingly fast compiles, extremely useful error and warning
+messages and to provide a platform for building great source level
+tools. The Clang Static Analyzer and clang-tidy are tools that
+automatically find bugs in your code, and are great examples of the
+sort of tools that can be built using the Clang frontend as a library
+to parse C/C++ code.
+"
+
+module-addgroup "Compiler"
+
+setenv		CC			$PREFIX/bin/clang
+setenv		CXX			$PREFIX/bin/clang++