diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index ef6483ebcd..3685bd1b97 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -195,6 +195,7 @@ switch $(HOST_GCC_MACHINE) {
 	case armv7l-*	: HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
 	case armv7hl-*	: HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
 	case armv7b-*	: HAIKU_HOST_IS_BIG_ENDIAN = 1 ;
+	case aarch64-*	: HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
 	case m68k-*		: HAIKU_HOST_IS_BIG_ENDIAN = 1 ;
 	case *			: Exit "Unsupported gcc host machine:" $(HOST_GCC_MACHINE) ;
 }
@@ -206,6 +207,7 @@ switch $(HOST_GCC_MACHINE) {
 	case i686-apple-darwin10 :	HOST_PLATFORM_IS_64_BIT = 1 ;
 	case i686-apple-darwin11 :	HOST_PLATFORM_IS_64_BIT = 1 ;
 	case x86_64-* :				HOST_PLATFORM_IS_64_BIT = 1 ;
+	case aarch64-* :			HOST_PLATFORM_IS_64_BIT = 1 ;
 }
 
 # If HAIKU_HOST_USE_32BIT is set, add the required gcc base flag (the LD flag
diff --git a/headers/build/config_build/HaikuConfig.h b/headers/build/config_build/HaikuConfig.h
index d29158f5bd..aba9b7fab0 100644
--- a/headers/build/config_build/HaikuConfig.h
+++ b/headers/build/config_build/HaikuConfig.h
@@ -42,6 +42,10 @@
 #	define __HAIKU_ARCH				armeb
 #	define __HAIKU_ARCH_ARM			1
 #	define __HAIKU_BIG_ENDIAN		1
+#elif __AARCH64EL__
+#	define __HAIKU_ARCH				aarch64
+#	define __HAIKU_ARCH_ARM			1
+#	define __HAIKU_ARCH_BITS		64
 #else
 #	error Unsupported architecture!
 #endif