diff --git a/makefile b/makefile
index b528fc2fb3..e8626126dd 100755
--- a/makefile
+++ b/makefile
@@ -139,7 +139,7 @@ endif
 input = List
 
 ifeq ($(use-clang),true)
-	build-cxx = clang
+	build-cxx = clang -std=c++11
 	build-cc = clang
 else
 	build-cxx = g++
diff --git a/src/compiler.cpp b/src/compiler.cpp
index e3e24103c6..812a38a9e9 100644
--- a/src/compiler.cpp
+++ b/src/compiler.cpp
@@ -1578,7 +1578,7 @@ class ConstantSite: public Site {
   virtual unsigned toString(Context*, char* buffer, unsigned bufferSize) {
     if (value->resolved()) {
       return vm::snprintf
-        (buffer, bufferSize, "constant %"LLD, value->value());
+        (buffer, bufferSize, "constant %" LLD, value->value());
     } else {
       return vm::snprintf(buffer, bufferSize, "constant unresolved");
     }
@@ -1669,7 +1669,7 @@ class AddressSite: public Site {
   virtual unsigned toString(Context*, char* buffer, unsigned bufferSize) {
     if (address->resolved()) {
       return vm::snprintf
-        (buffer, bufferSize, "address %"LLD, address->value());
+        (buffer, bufferSize, "address %" LLD, address->value());
     } else {
       return vm::snprintf(buffer, bufferSize, "address unresolved");
     }