diff --git a/ChangeLog b/ChangeLog
index 31f52a0f..7fdda9d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* jtagmkII.c (jtagmkII_memtype): return MTYPE_FLASH rather than
+	MTYPE_SPM for non-Xmega flash regions
+
 2012-07-18  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* configure.ac: check for libelf.h also in libelf/
diff --git a/jtagmkII.c b/jtagmkII.c
index c96d4ca7..a28281b3 100644
--- a/jtagmkII.c
+++ b/jtagmkII.c
@@ -2762,7 +2762,7 @@ static unsigned char jtagmkII_memtype(PROGRAMMER * pgm, AVRPART * p, unsigned lo
     else
       return MTYPE_FLASH;
   } else {
-    return MTYPE_SPM;
+    return MTYPE_FLASH_PAGE;
   }
 }