diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c
index a4484b0f..88653d8f 100644
--- a/libisoburn/trunk/xorriso/emulators.c
+++ b/libisoburn/trunk/xorriso/emulators.c
@@ -617,7 +617,7 @@ int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom,
  static char ignored_arg0_options[][41]= {
    "-allow-leading-dots", "-ldots", "-allow-multidot",
    "-cache-inodes", "-no-cache-inodes", "-check-oldnames", "-D",
-   "-joliet-long", "-L", "-max-iso9660-filenames", "-nobak",
+   "-L", "-max-iso9660-filenames", "-nobak",
    "-no-bak", "-force-rr", "-relaxed-filenames", "-T",
    "-no-iso-translate",
    ""
@@ -684,6 +684,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
 "  -output-charset CHARSET     Output charset for file name conversion",
 "  -iso-level LEVEL            Set ISO9660 conformance level (1..3)",
 "  -J, -joliet                 Generate Joliet directory information",
+"  -joliet-long                Allow Joliet file names to be 103 Unicode characters",
 "  -U, -untranslated-filenames Allow Untranslated filenames (for HPUX & AIX - violates ISO9660).",
 "  -allow-lowercase            Allow lower case characters in addition to the current character set (violates ISO9660)",
 "  -d, -omit-period            Omit trailing periods from filenames (violates ISO9660)",
@@ -1134,6 +1135,10 @@ illegal_c:;
      lower_r= 1;
    } else if(strcmp(argv[i], "-J")==0 || strcmp(argv[i], "-joliet")==0) {
      xorriso->do_joliet= 1;
+   } else if(strcmp(argv[i], "-joliet-long")==0) {
+     ret= Xorriso_option_compliance(xorriso, "joliet_long_paths", 0);
+     if(ret<=0)
+       goto problem_handler_2;
    } else if(strcmp(argv[i], "-graft-points")==0) {
      xorriso->allow_graft_points= 1;
    } else if(strcmp(argv[i], "-path-list")==0 ||
@@ -1416,8 +1421,7 @@ problem_handler_2:;
  }
  if(do_print_size) {
    ret= Xorriso_option_print_size(xorriso, 1);
-   if(ret<=0)
-     goto ex;
+   goto ex;
  }
  if(lower_r) {
    static char *lower_r_args[3]= {"/", "-exec", "mkisofs_r"};
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 4dd386af..2e480bd4 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.10.27.063628"
+#define Xorriso_timestamP "2010.10.27.063705"