diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c
index c6ccf2ad..1f50a198 100644
--- a/libisoburn/trunk/xorriso/write_run.c
+++ b/libisoburn/trunk/xorriso/write_run.c
@@ -576,6 +576,12 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
    {ret= 0; goto ex;}
  }
  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.");
+   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
+   load_size= 65535 * 512;
+ }
  el_torito_set_load_size(bootimg, load_size / 512); 
  el_torito_set_id_string(bootimg, xorriso->boot_id_string);
  el_torito_set_selection_crit(bootimg, xorriso->boot_selection_crit);
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 1a1398ed..be9493fc 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2013.03.12.124913"
+#define Xorriso_timestamP "2013.03.12.194637"