diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index 715387cc7752..da060553eb85 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
-#if defined(__i386__) && !defined(GPTBOOT)
+#if (defined(__i386__) && !defined(GPTBOOT)) || defined(__arm__)
 /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
    (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
    support both UFS1 and UFS2 again. */