diff --git a/ChangeLog b/ChangeLog
index ff13c60..a1595e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* src/configure (FLASH_SIZE): Without 'k'.
 	* src/gnuk.ld.in (MEMORY): Append "k" here.
+	(.gnuk_flash): End point should be aligned too.
 
 	* src/config.h.in (@PINPAD_DEFINE@): New.
 	* src/Makefile.in (@PINPAD_MAKE_OPTION@): New.
diff --git a/src/gnuk.ld.in b/src/gnuk.ld.in
index 3bd0aec..7c8b154 100644
--- a/src/gnuk.ld.in
+++ b/src/gnuk.ld.in
@@ -130,6 +130,7 @@ SECTIONS
 	_keystore_pool = .;
 	FILL(0xffffffff);
 	. += 512*3;
+	. = ALIGN(@FLASH_PAGE_SIZE@);
     } > flash
 }