diff --git a/libisoburn/trunk/libisoburn/isoburn.c b/libisoburn/trunk/libisoburn/isoburn.c
index d3db5796..9f189024 100644
--- a/libisoburn/trunk/libisoburn/isoburn.c
+++ b/libisoburn/trunk/libisoburn/isoburn.c
@@ -1515,7 +1515,7 @@ int isoburn_igopt_set_system_area(struct isoburn_imgen_opts *opts,
    }
    memcpy(opts->system_area_data, data, 32768);
  }
- opts->system_area_options = options & 0x7fff;
+ opts->system_area_options = options & 0xffff;
  return(1);
 }
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index e2dfed09..c6568b6d 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2015.12.30.175951"
+#define Xorriso_timestamP "2016.01.01.172059"