diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 7c47b89022..3074520601 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -180,6 +180,7 @@ switch $(HAIKU_GCC_MACHINE) {
 	case powerpc-*	: HAIKU_CPU = ppc ;
 	case m68k-*	: HAIKU_CPU = m68k ;
 	case mipsel-*	: HAIKU_CPU = mipsel ;
+	case arm-*	: HAIKU_CPU = arm ;
 	case * : Exit "Unsupported gcc target machine:" $(HAIKU_GCC_MACHINE) ;
 }
 
@@ -192,6 +193,15 @@ switch $(HAIKU_CPU) {
 		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
 	}
+	case arm :
+	{
+		HAIKU_DEFINES += __ARM__ ;
+		HAIKU_BOOT_PLATFORM = u-boot ;
+		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB (there is not realy a floppy on the gumstix ;) )
+		# offset in floppy image (>= sizeof(haiku_loader))
+		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
+				
+	}
 	case x86 :
 	{
 		HAIKU_DEFINES += __INTEL__ ;