diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 83b75480..8d2323a9 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-22  Arnim Laeuger <arniml>
+
+  * src/flash/intel.c, src/flash/amd.c: set max_bytes_write to std value 1
+    instead of 0
+
 2009-11-17  Rutger Hofman <rfhh>
 
   * src/bus/writemem.c: big-endian write shifts one too much. Patch by
diff --git a/urjtag/src/flash/amd.c b/urjtag/src/flash/amd.c
index 49f00abe..b4c00810 100644
--- a/urjtag/src/flash/amd.c
+++ b/urjtag/src/flash/amd.c
@@ -589,7 +589,7 @@ amd_flash_program (urj_flash_cfi_array_t *cfi_array, uint32_t adr,
     int max_bytes_write = cfi->device_geometry.max_bytes_write;
 
 #ifndef FLASH_MULTI_BYTE
-    max_bytes_write = 0;
+    max_bytes_write = 1;
 #endif
 
     /* multi-byte writes supported? */
diff --git a/urjtag/src/flash/intel.c b/urjtag/src/flash/intel.c
index 2a0913a9..e800eb98 100644
--- a/urjtag/src/flash/intel.c
+++ b/urjtag/src/flash/intel.c
@@ -382,7 +382,7 @@ intel_flash_program (urj_flash_cfi_array_t *cfi_array,
     int max_bytes_write = cfi->device_geometry.max_bytes_write;
 
 #ifndef FLASH_MULTI_BYTE
-    max_bytes_write = 0;
+    max_bytes_write = 1;
 #endif
 
     /* multi-byte writes supported? */