diff --git a/xorriso/emulators.c b/xorriso/emulators.c
index cb254c64..6670c435 100644
--- a/xorriso/emulators.c
+++ b/xorriso/emulators.c
@@ -559,6 +559,8 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
     "-hppa-bootloader", "-hppa-ramdisk", "-mips-boot", "-mipsel-boot",
     "-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size",
     "-jigdo-force-md5", "-jigdo-exclude", "-jigdo-map", "-md5-list",
+    "-jigdo-template-compress",
+    "-checksum_algorithm_iso", "-checksum_algorithm_template",
     "--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot",
     "-isohybrid-mbr", "-e", "-partition_offset", "-partition_hd_cyl",
     "-partition_sec_hd",
@@ -615,6 +617,7 @@ int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom,
  static char ignored_arg1_options[][41]= {
    "-check-session", "-hide-hfs", "-hide-hfs-list", "-root",
    "-old-root", "-table-name", "-volset-seqno", "-volset-size",
+   "-checksum_algorithm_iso", "-checksum_algorithm_template",
    ""
  };
  int k, idx_offset= 0;
@@ -720,6 +723,8 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
 "  -jigdo-map PATTERN1=PATTERN2",
 "                              Pattern(s) to map paths (e.g. Debian=/mirror/debian)",
 "  -md5-list FILE              File containing MD5 sums of the files that should be checked",
+"  -jigdo-template-compress ALGORITHM",
+"                              Choose to use gzip or bzip2 compression for template data; default is gzip",
 "  -b FILE, -eltorito-boot FILE",
 "                              Set El Torito boot image name",
 "  -eltorito-alt-boot          Start specifying alternative El Torito boot parameters",
@@ -1366,6 +1371,7 @@ is_unknown_option_2:;
              strcmp(argv[i], "-jigdo-exclude") == 0 ||     
              strcmp(argv[i], "-jigdo-force-md5") == 0 ||     
              strcmp(argv[i], "-jigdo-map") == 0 ||     
+             strcmp(argv[i], "-jigdo-template-compress") == 0 ||     
              strcmp(argv[i], "-md5-list") == 0) {
      i++;
      ret= Xorriso_option_jigdo(xorriso, argv[i - 1], argv[i], 0);
diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c
index 9fd63a2e..299e9508 100644
--- a/xorriso/lib_mgt.c
+++ b/xorriso/lib_mgt.c
@@ -600,7 +600,8 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg,
    ret= libjte_set_checksum_template(jte, arg);
    if(ret <= 0)
      goto jte_failed;
- } else if(strcmp(aspect, "compression") == 0) {
+ } else if(strcmp(aspect, "compression") == 0 ||
+           strcmp(aspect, "-jigdo-template-compress") == 0) {
    ret= libjte_set_compression(jte, arg);
    if(ret <= 0)
      goto jte_failed;
diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1
index 14017072..dae2ee7d 100644
--- a/xorriso/xorriso.1
+++ b/xorriso/xorriso.1
@@ -9,7 +9,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH XORRISO 1 "Sep 29, 2010"
+.TH XORRISO 1 "Oct 02, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -2475,8 +2475,13 @@ Alias: -jigdo-force-md5
 \fBmapping\fR adds a string pair of the form To=From to the parameter list.
 The absolute disk_path of any file that will be listed in the .jigdo file will
 be checked whether it begins with the From string. If so, this string will
-be replaced by the To string and a ':' character. E.g. "Debian=/mirror/debian".
+be replaced by the To string and a ':' character. The From string should end
+by a '/' character.
 Alias: -jigdo-map
+.br
+\fBcompression\fR chooses one of "bzip2" or "gzip" for the compression of
+the template file. The jigdo file is put out uncompressed.
+Alias: -jigdo-template-compress
 .TP
 .B Character sets:
 .PP
diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info
index 6871aee7..d1391125 100644
--- a/xorriso/xorriso.info
+++ b/xorriso/xorriso.info
@@ -2199,8 +2199,11 @@ and padding.
      list.  The absolute disk_path of any file that will be listed in
      the .jigdo file will be checked whether it begins with the From
      string. If so, this string will be replaced by the To string and a
-     ':' character. E.g. "Debian=/mirror/debian".
+     ':' character. The From string should end by a '/' character.
 Alias: -jigdo-map
+*compression* chooses one of "bzip2" or "gzip" for the compression of
+the template file. The jigdo file is put out uncompressed.  Alias:
+-jigdo-template-compress
 
 
 File: xorriso.info,  Node: Charset,  Next: Exception,  Prev: Jigdo,  Up: Options
@@ -4266,37 +4269,37 @@ Node: Writing79789
 Node: SetWrite86078
 Node: Bootable98029
 Node: Jigdo107119
-Node: Charset110231
-Node: Exception112982
-Node: DialogCtl117497
-Node: Inquiry119842
-Node: Navigate123972
-Node: Verify131570
-Node: Restore139990
-Node: Emulation146646
-Node: Scripting154646
-Node: Frontend160208
-Node: Examples161409
-Node: ExDevices162578
-Node: ExCreate163212
-Node: ExDialog164486
-Node: ExGrowing165748
-Node: ExModifying166550
-Node: ExBootable167051
-Node: ExCharset167598
-Node: ExPseudo168426
-Node: ExCdrecord169320
-Node: ExMkisofs169635
-Node: ExGrowisofs170638
-Node: ExException171762
-Node: ExTime172216
-Node: ExIncBackup172675
-Node: ExRestore176147
-Node: ExRecovery177116
-Node: Files177682
-Node: Seealso178910
-Node: Legal179434
-Node: CommandIdx180356
-Node: ConceptIdx194300
+Node: Charset110410
+Node: Exception113161
+Node: DialogCtl117676
+Node: Inquiry120021
+Node: Navigate124151
+Node: Verify131749
+Node: Restore140169
+Node: Emulation146825
+Node: Scripting154825
+Node: Frontend160387
+Node: Examples161588
+Node: ExDevices162757
+Node: ExCreate163391
+Node: ExDialog164665
+Node: ExGrowing165927
+Node: ExModifying166729
+Node: ExBootable167230
+Node: ExCharset167777
+Node: ExPseudo168605
+Node: ExCdrecord169499
+Node: ExMkisofs169814
+Node: ExGrowisofs170817
+Node: ExException171941
+Node: ExTime172395
+Node: ExIncBackup172854
+Node: ExRestore176326
+Node: ExRecovery177295
+Node: Files177861
+Node: Seealso179089
+Node: Legal179613
+Node: CommandIdx180535
+Node: ConceptIdx194479
 
 End Tag Table
diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi
index 6a7d48ba..ad0af9aa 100644
--- a/xorriso/xorriso.texi
+++ b/xorriso/xorriso.texi
@@ -44,7 +44,7 @@
 @c man .\" First parameter, NAME, should be all caps
 @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 @c man .\" other parameters are allowed: see man(7), man(1)
-@c man .TH XORRISO 1 "Sep 29, 2010"
+@c man .TH XORRISO 1 "Oct 02, 2010"
 @c man .\" Please adjust this date whenever revising the manpage.
 @c man .\"
 @c man .\" Some roff macros, for reference:
@@ -2953,9 +2953,14 @@ Alias: -jigdo-force-md5
 @strong{mapping} adds a string pair of the form To=From to the parameter list.
 The absolute disk_path of any file that will be listed in the .jigdo file will
 be checked whether it begins with the From string. If so, this string will
-be replaced by the To string and a ':' character. E.g. "Debian=/mirror/debian".
+be replaced by the To string and a ':' character. The From string should end
+by a '/' character.
 @end table
 Alias: -jigdo-map
+@*
+@strong{compression} chooses one of "bzip2" or "gzip" for the compression of
+the template file. The jigdo file is put out uncompressed.
+Alias: -jigdo-template-compress
 @c man .TP
 @c man .B Character sets:
 @node Charset, Exception, Jigdo, Options
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 72d62262..8ac61cbd 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.10.01.190235"
+#define Xorriso_timestamP "2010.10.02.121147"