diff --git a/libisoburn/trunk/xorriso/opts_d_h.c b/libisoburn/trunk/xorriso/opts_d_h.c
index 2496906d..35c0855e 100644
--- a/libisoburn/trunk/xorriso/opts_d_h.c
+++ b/libisoburn/trunk/xorriso/opts_d_h.c
@@ -690,12 +690,20 @@ int Xorriso_option_file_size_limit(struct XorrisO *xorriso,
  if(new_limit <= 0) {
    sprintf(xorriso->info_text, "-file_size_limit: values sum up to %.f",
            (double) new_limit);
-   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 1);
+   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
    ret= 0; goto ex;
  }
  xorriso->file_size_limit= new_limit;
  ret= 1;
 ex:;
+ if((xorriso->file_size_limit >= ((off_t) 4) * (off_t) (1024 * 1024 * 1024) ||
+     xorriso->file_size_limit == 0) && xorriso->iso_level < 3 && ret > 0) {
+   xorriso->iso_level= 3;
+   xorriso->iso_level_is_default= 0;
+   Xorriso_msgs_submit(xorriso, 0,
+                       "-file_size_limit of at least 4 GiB causes ISO level 3",
+                       0, "NOTE", 0);
+ }
  (*idx)= end_idx;
  if(ret > 0) {
    if(xorriso->file_size_limit > 0)
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 22a2c4b3..d719c56a 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2016.09.12.091506"
+#define Xorriso_timestamP "2016.09.12.163816"