diff --git a/ChangeLog b/ChangeLog
index c596813..d5b211d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-14  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* src/configure (FLASH_PAGE_SIZE): Always set.
+
 2010-12-13  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* Version 0.5.
diff --git a/src/configure b/src/configure
index c5ba935..8867210 100755
--- a/src/configure
+++ b/src/configure
@@ -141,11 +141,6 @@ if test "$with_dfu" = "yes"; then
 else
   echo "Configured for bare system (no-DFU)"
   ORIGIN=0x08000000
-  if test "$target" = "STM32_PRIMER2"; then
-    FLASH_PAGE_SIZE=2048
-  else
-    FLASH_PAGE_SIZE=1024
-  fi
   if test "$target" = "STM8S_DISCOVERY"; then
     FLASH_SIZE=64k
   else
@@ -154,6 +149,12 @@ else
   DFU_DEFINE="#undef DFU_SUPPORT"
 fi
 
+if test "$target" = "STM32_PRIMER2"; then
+  FLASH_PAGE_SIZE=2048
+else
+  FLASH_PAGE_SIZE=1024
+fi
+
 sed -e "s%@BOARD_MAKEFILE@%$BOARD_MAKEFILE%" \
     -e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \
 	< Makefile.in > Makefile