diff --git a/uppbox/Scripts/CLANGMK.bm b/uppbox/Scripts/CLANGMK.bm
new file mode 100644
index 000000000..bc2fd5528
--- /dev/null
+++ b/uppbox/Scripts/CLANGMK.bm
@@ -0,0 +1,24 @@
+BUILDER = "CLANG";
+COMPILER = "clang++";
+COMMON_OPTIONS = "-Wno-logical-op-parentheses";
+COMMON_CPP_OPTIONS = "-std=c++0x";
+COMMON_C_OPTIONS = "";
+COMMON_FLAGS = "";
+DEBUG_INFO = "2";
+DEBUG_BLITZ = "1";
+DEBUG_LINKMODE = "1";
+DEBUG_OPTIONS = "-O0";
+DEBUG_FLAGS = "";
+DEBUG_LINK = "";
+RELEASE_BLITZ = "0";
+RELEASE_LINKMODE = "1";
+RELEASE_OPTIONS = "-O3 -ffunction-sections -fdata-sections";
+RELEASE_SIZE_OPTIONS = "-Os -ffunction-sections -fdata-sections";
+RELEASE_FLAGS = "";
+RELEASE_LINK = "-Wl,--gc-sections";
+DEBUGGER = "zero";
+PATH = "";
+INCLUDE = "/usr/include/gtk-2.0;/usr/lib/x86_64-linux-gnu/gtk-2.0/include;/usr/include/atk-1.0;/usr/include/cairo;/usr/include/gdk-pixbuf-2.0;/usr/include/pango-1.0;/usr/include/gio-unix-2.0/;/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include;/usr/include/pixman-1;/usr/include/freetype2;/usr/include/libpng12;/usr/include/harfbuzz;/usr/include/freetype2;/usr/include/gtk-2.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/atk-1.0;/usr/X11R6/include;/usr/X11R6/include/freetype2;/usr/X11R6/include/gtk-2.0;/usr/X11R6/include/glib-2.0;/usr/X11R6/lib/glib-2.0/include;/usr/X11R6/lib/gtk-2.0/include;/usr/X11R6/include/cairo;/usr/X11R6/include/pango-1.0;/usr/X11R6/include/atk-1.0;/usr/include/gdk-pixbuf-2.0";
+LIB = "/usr/X11R6/lib;/usr/lib";
+LINKMODE_LOCK = "0";
+ALLOW_PRECOMPILED_HEADERS = "0";
diff --git a/uppbox/Scripts/Scripts.upp b/uppbox/Scripts/Scripts.upp
index 741fa0a43..65a86bed4 100644
--- a/uppbox/Scripts/Scripts.upp
+++ b/uppbox/Scripts/Scripts.upp
@@ -9,6 +9,7 @@ file
 	debian,
 	all,
 	GCCMK.bm,
+	CLANGMK.bm,
 	Makefile,
 	doinstall,
 	domake,
diff --git a/uppbox/Scripts/doinstall b/uppbox/Scripts/doinstall
index 8f5cb2418..0f41631c3 100644
--- a/uppbox/Scripts/doinstall
+++ b/uppbox/Scripts/doinstall
@@ -18,6 +18,7 @@ mkdir ~/.upp
 mkdir ~/.upp/theide
 
 cp GCC.bm ~/.upp/theide
+cp CLANG.bm ~/.upp/theide
 cp en-gb.scd ~/.upp/theide
 cp en-us.scd ~/.upp/theide
 
diff --git a/uppbox/Scripts/domake b/uppbox/Scripts/domake
index 1e0868f58..a27fad8cc 100644
--- a/uppbox/Scripts/domake
+++ b/uppbox/Scripts/domake
@@ -3,10 +3,12 @@ then
 	sed -e "s@-I((INCLUDES))@`pkg-config --cflags-only-I gtk+-2.0`@g" uppsrc/Makefile.in >uppsrc/Makefile
 	sed -e "s@-I((INCLUDES))@`pkg-config --cflags-only-I gtk+-2.0`@g" uppsrc/uMakefile.in >uppsrc/uMakefile
 	sed -e "s@((INCLUDES))@`pkg-config --cflags-only-I gtk+-2.0|sed -e s/-I//g -e \"s/ /;/g\"`@g" GCC.bm.in >GCC.bm
+	sed -e "s@((INCLUDES))@`pkg-config --cflags-only-I gtk+-2.0|sed -e s/-I//g -e \"s/ /;/g\"`@g" CLANG.bm.in >CLANG.bm
 else
 	sed -e "s@((INCLUDES))@@g" uppsrc/Makefile.in >uppsrc/Makefile
 	sed -e "s@((INCLUDES))@@g" uppsrc/uMakefile.in >uppsrc/uMakefile
 	sed -e "s@((INCLUDES))@@g" GCC.bm.in >GCC.bm
+	sed -e "s@((INCLUDES))@@g" CLANG.bm.in >CLANG.bm
 fi
 
 if [ ! -f /usr/lib/libdl.so ]
diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src
index 52ba3143e..4f6057b1f 100644
--- a/uppbox/Scripts/src
+++ b/uppbox/Scripts/src
@@ -29,6 +29,7 @@ cp ~/Scripts/upp.spec ~/upp.tmp/upp
 cp ~/Scripts/debian ~/upp.tmp/upp
 
 cp ~/Scripts/GCCMK.bm ~/upp.tmp/upp/GCC.bm.in
+cp ~/Scripts/CLANGMK.bm ~/upp.tmp/upp/CLANG.bm.in
 
 cd ~/upp.tmp
 mv upp upp-x11-src-`svnversion ~/upp.src`