diff --git a/Make.defaults b/Make.defaults
index 74ac8ed..30ba06d 100755
--- a/Make.defaults
+++ b/Make.defaults
@@ -172,7 +172,7 @@ ifeq ($(ARCH),arm)
 CFLAGS += -marm
 endif
 
-ifeq ($(ARCH),aarch64)
+ifneq (,$(filter $(ARCH),aarch64 arm))
 LDFLAGS += -z common-page-size=4096
 LDFLAGS += -z max-page-size=4096
 endif
diff --git a/gnuefi/elf_arm_efi.lds b/gnuefi/elf_arm_efi.lds
index cae55ea..ec09eb0 100644
--- a/gnuefi/elf_arm_efi.lds
+++ b/gnuefi/elf_arm_efi.lds
@@ -27,7 +27,7 @@ SECTIONS
   } =0
   _reloc_vsize = _evreloc - _reloc;
   _reloc_size = _ereloc - _reloc;
-  . = ALIGN(4096);
+  . = ALIGN(65536);
   _data = .;
   .dynamic  : { *(.dynamic) }
   . = ALIGN(4096);