diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h
index 0453c0a99a..8d405bba6c 100644
--- a/headers/config/HaikuConfig.h
+++ b/headers/config/HaikuConfig.h
@@ -59,7 +59,8 @@
 #endif
 
 /* BeOS R5 compatible types */
-#ifdef __HAIKU_ARCH_X86
+#ifndef __HAIKU_ARCH_64_BIT
+/*#ifdef __HAIKU_ARCH_X86*/
 	/* TODO: This should be "#ifdef __HAIKU_BEOS_COMPATIBLE", but this will
 	   break all gcc 4 C++ optional packages. I.e. switch that at a suitable
 	   time.