diff --git a/headers/build/config_build/HaikuConfig.h b/headers/build/config_build/HaikuConfig.h
index 8d4952210f..d29158f5bd 100644
--- a/headers/build/config_build/HaikuConfig.h
+++ b/headers/build/config_build/HaikuConfig.h
@@ -35,9 +35,13 @@
 #elif __MIPSEL__
 #	define __HAIKU_ARCH				mipsel
 #	define __HAIKU_ARCH_MIPSEL		1
-#elif __ARM__
+#elif __ARM__ || __ARMEL__
 #	define __HAIKU_ARCH				arm
 #	define __HAIKU_ARCH_ARM			1
+#elif __ARMEB__
+#	define __HAIKU_ARCH				armeb
+#	define __HAIKU_ARCH_ARM			1
+#	define __HAIKU_BIG_ENDIAN		1
 #else
 #	error Unsupported architecture!
 #endif
diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h
index c1dea0dae2..6648f53ec4 100644
--- a/headers/config/HaikuConfig.h
+++ b/headers/config/HaikuConfig.h
@@ -47,10 +47,15 @@
 #	define __HAIKU_ARCH					mipsel
 #	define __HAIKU_ARCH_ABI				"mipsel"
 #	define __HAIKU_ARCH_MIPSEL			1
-#elif __ARM__
+#elif __ARM__ || __ARMEL__
 #	define __HAIKU_ARCH					arm
 #	define __HAIKU_ARCH_ABI				"arm"
 #	define __HAIKU_ARCH_ARM				1
+#elif __ARMEB__
+#	define __HAIKU_ARCH					armeb
+#	define __HAIKU_ARCH_ABI				"armeb"
+#	define __HAIKU_ARCH_ARM				1
+#	define __HAIKU_BIG_ENDIAN			1
 #else
 #	error Unsupported architecture!
 #endif
diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h
index 1b2e7f8849..7b639a5cae 100644
--- a/headers/os/kernel/OS.h
+++ b/headers/os/kernel/OS.h
@@ -428,7 +428,7 @@ extern void			ktrace_vprintf(const char *format, va_list args);
 #	define B_MAX_CPU_COUNT	8
 #elif __M68K__
 #	define B_MAX_CPU_COUNT	1
-#elif __ARM__
+#elif __ARM__ || __ARMEL__ || __ARMEB__
 #	define B_MAX_CPU_COUNT	1
 #elif __MIPSEL__
 #	define B_MAX_CPU_COUNT	1