diff --git a/Makefile b/Makefile
index 7eb4989c7dc..9a873ec417a 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ aix-gcc \
 aix-static \
 beos \
 bluegene-osmesa \
+bluegene-xlc-osmesa \
 darwin \
 darwin-static \
 darwin-static-x86ppc \
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index fd4127558a8..9739f68e752 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -237,7 +237,7 @@
 #endif
 
 
-#if !defined __GNUC__ || __GNUC__ < 3
+#if (!defined __GNUC__ || __GNUC__ < 3) && !defined __IBMC__
 #  define __builtin_expect(x, y) x
 #endif