diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index 43e1e754..54eb672c 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -729,9 +729,16 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
  el_torito_set_boot_platform_id(bootimg, (uint8_t) platform_id);
  if(load_size / 512 > 65535) {
    sprintf(xorriso->info_text,
- "Boot image load size exceeds 65535 blocks. Will record 65535 in El Torito.");
+           "Boot image load size exceeds 65535 blocks of 512 bytes. ");
+   if(platform_id == 0xef) {
+     strcat(xorriso->info_text,
+            "Will record 0 in El Torito to extend ESP to end-of-medium.");
+     load_size= 0;
+   } else {
+     strcat(xorriso->info_text, "Will record 65535 in El Torito.");
+     load_size= 65535 * 512;
+   }
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
-   load_size= 65535 * 512;
  }
          /* The function will understand negative short as positive unsigned */
  el_torito_set_load_size(bootimg, (short) (load_size / 512)); 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index c49d6601..c2263008 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2015.10.18.130151"
+#define Xorriso_timestamP "2015.10.23.085903"