diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c
index d2f5d698..924d0657 100644
--- a/libisoburn/trunk/xorriso/write_run.c
+++ b/libisoburn/trunk/xorriso/write_run.c
@@ -643,7 +643,8 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
    load_size= 65535 * 512;
  }
- el_torito_set_load_size(bootimg, load_size / 512); 
+         /* The function will understand negative short as positive unsigned */
+ el_torito_set_load_size(bootimg, (short) (load_size / 512)); 
  el_torito_set_id_string(bootimg, xorriso->boot_id_string);
  el_torito_set_selection_crit(bootimg, xorriso->boot_selection_crit);
  ret= Xorriso_set_isolinux_options(xorriso, image, 1);
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 65a1cdeb..291b5435 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2014.04.24.084041"
+#define Xorriso_timestamP "2014.04.24.084540"