diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index 8d7e3c6deb3f..3ea398958aab 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -6,7 +6,6 @@ SYSDIR?=${.CURDIR}/../..
 SUBDIR=	geom_bde \
 	geom_cache \
 	geom_concat \
-	geom_eli \
 	geom_gate \
 	geom_journal \
 	geom_label \
@@ -30,4 +29,9 @@ SUBDIR=	geom_bde \
 SUBDIR+=	geom_ccd
 .endif
 
+# Alignment issues in g_eli_auth_run() on MIPS64 causes kernel panic
+.if ${MACHINE_ARCH} != "mips64" && ${MACHINE_ARCH} != "mips64el"
+SUBDIR+=	geom_eli
+.endif
+
 .include <bsd.subdir.mk>