diff --git a/waflib/extras/clang_cl.py b/waflib/extras/clang_cl.py
new file mode 100644
index 00000000..cfbbdbd6
--- /dev/null
+++ b/waflib/extras/clang_cl.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+# encoding: utf-8
+# vim: sw=4 ts=4 noexpandtab
+
+"""
+LLVM Clang-CL support.
+
+Clang-CL is supposed to be a drop-in replacement for MSVC CL, but also serves
+well as a cross compiler for Windows from Linux (provided you have set up the
+environment). Requires Visual Studio 2015+ to be installed.
+
+On Windows it uses (most) MSVC tools.
+See waflib/Tools/msvc.py and waflib/Tools/msvc_common.py for more details.
+
+Usage:
+	$ waf configure
+Or:
+	$ LLVM_PATH=C:\Program Files\LLVM\bin waf configure
+Or:
+	def configure(conf):
+		conf.env.LLVM_PATH = 'C:\Program Files\LLVM\bin'
+		conf.load('clang_cl')
+"""
+
+import sys, os
+
+from waflib import Utils
+from waflib.Configure import conf
+
+def options(opt):
+	from waflib.Tools.msvc import options as msvc_opt
+	msvc_opt(opt)
+
+@conf
+def find_clang_cl(conf):
+	"""
+	Find the program clang-cl.
+	"""
+
+	v = conf.env
+
+	del(v.CC)
+	del(v.CXX)
+
+	llvm_path = str()
+
+	if sys.platform == 'win32':
+		try:
+			llvm_key = Utils.winreg.OpenKey( \
+				Utils.winreg.HKEY_LOCAL_MACHINE, \
+				'SOFTWARE\\Wow6432Node\\LLVM\\LLVM')
+		except OSError:
+			llvm_key = Utils.winreg.OpenKey( \
+				Utils.winreg.HKEY_LOCAL_MACHINE, \
+				'SOFTWARE\\LLVM\\LLVM')
+
+		llvm_path,type = Utils.winreg.QueryValueEx(llvm_key, '')
+		llvm_path = os.path.join(llvm_path, 'bin')
+
+	llvm_env_path = conf.environ.get('LLVM_PATH')
+	if llvm_env_path:
+		llvm_path = llvm_env_path
+	elif 'LLVM_PATH' in v:
+		llvm_path = v['LLVM_PATH']
+
+	paths = v.PATH
+	if llvm_path != 'bin' and llvm_path != str():
+		paths = [llvm_path] + v.PATH
+
+	cc = conf.find_program('clang-cl', var='CC', path_list=paths)
+	v.CC = v.CXX = cc
+	v.CC_NAME_SECONDARY = v.CXX_NAME_SECONDARY = 'clang'
+
+def configure(conf):
+	from waflib.Tools.msvc import autodetect, find_msvc, msvc_common_flags
+
+	conf.autodetect(True)
+	conf.find_msvc()
+	conf.find_clang_cl()
+	conf.msvc_common_flags()
+	conf.cc_load_tools()
+	conf.cxx_load_tools()
+	conf.cc_add_flags()
+	conf.cxx_add_flags()
+	conf.link_add_flags()
+	conf.visual_studio_add_flags()