diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c
index ffda6747..b1e5170c 100644
--- a/libisoburn/trunk/xorriso/emulators.c
+++ b/libisoburn/trunk/xorriso/emulators.c
@@ -1522,6 +1522,8 @@ illegal_c:;
      if(argv[i] != argpt)
        delay_opt_list[delay_opt_count - 1]|= 1<<31;
      i+= arg_count;
+   } else if(strcmp(argpt, "-hfsplus") == 0) {
+     /* was already handled in first argument scan */;
    } else if(strcmp(argpt, "-hfsplus-serial-no") == 0) {
      if(i+1>=argc)
        goto not_enough_args;
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index f2e4a13f..eff2083e 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.06.08.071018"
+#define Xorriso_timestamP "2012.06.10.083050"