diff --git a/builtins/util.m4 b/builtins/util.m4
index 52c642b4..0ea7763e 100644
--- a/builtins/util.m4
+++ b/builtins/util.m4
@@ -1500,7 +1500,7 @@ define <$1 x $2> @__atomic_compare_exchange_$3_global($2* %ptr, <$1 x $2> %cmp,
   ifelse(LLVM_VERSION,LLVM_3_5,`
     %r_LANE_ID_t = cmpxchg $2 * %ptr, $2 %cmp_LANE_ID, $2 %val_LANE_ID seq_cst seq_cst
     %r_LANE_ID = extractvalue { $2, i1 } %r_LANE_ID_t, 0
-  ',LLVM_VERSION,LLVM_3_6,`
+  ',LLVM_VERSION,LLVM_3_6,` ; this is duplicated for 3.6 since m4 has no OR and AND operators
     %r_LANE_ID_t = cmpxchg $2 * %ptr, $2 %cmp_LANE_ID, $2 %val_LANE_ID seq_cst seq_cst
     %r_LANE_ID = extractvalue { $2, i1 } %r_LANE_ID_t, 0
   ',`
@@ -1518,7 +1518,7 @@ define $2 @__atomic_compare_exchange_uniform_$3_global($2* %ptr, $2 %cmp,
   ifelse(LLVM_VERSION,LLVM_3_5,`
    %r_t = cmpxchg $2 * %ptr, $2 %cmp, $2 %val seq_cst seq_cst
    %r = extractvalue { $2, i1 } %r_t, 0
-  ',LLVM_VERSION,LLVM_3_6,`
+  ',LLVM_VERSION,LLVM_3_6,` ; this is duplicated for 3.6 since m4 has no OR and AND operators
    %r_t = cmpxchg $2 * %ptr, $2 %cmp, $2 %val seq_cst seq_cst
    %r = extractvalue { $2, i1 } %r_t, 0
   ',`
diff --git a/docs/ReleaseNotes.txt b/docs/ReleaseNotes.txt
index 7b76dd4c..ef8cf6f8 100644
--- a/docs/ReleaseNotes.txt
+++ b/docs/ReleaseNotes.txt
@@ -77,8 +77,7 @@ If you are not using pre-built binaries, you may notice the following changes:
   This is a preferred way to build LLVM for ISPC, as all required patches for
   better performance and stability will automatically apply.
 
-* LLVM 3.5 is supported.
-* LLVM 3.6 (current trunk) is supported.
+* LLVM 3.5 (current trunk) is supported.
 
 There are also multiple fixes for better performance and stability, most
 notable are: