diff --git a/libisoburn/branches/ZeroFiveEight/xorriso/changelog.txt b/libisoburn/branches/ZeroFiveEight/xorriso/changelog.txt
index f7c9ae18..a6436612 100644
--- a/libisoburn/branches/ZeroFiveEight/xorriso/changelog.txt
+++ b/libisoburn/branches/ZeroFiveEight/xorriso/changelog.txt
@@ -7614,7 +7614,7 @@ svn copy -m Branching for libisoburn release 0.5.6
 http://svn.libburnia-project.org/libisoburn/trunk
 http://svn.libburnia-project.org/libisoburn/branches/ZeroFiveSix
 
-2010.05.04.100001  [3213]
+2010.05.04.100001  [3211]
 configure.ac
 README
 libisoburn/libisoburn.h
@@ -7628,7 +7628,7 @@ xorriso/configure_ac.txt
 xorriso/xorriso_timestamp.h
 Version leap to libisoburn-0.5.6
 
-04 May 2010  []
+04 May 2010  [3212]
 xorriso/changelog.txt
 Documented changes and release timestamp
 
@@ -7638,7 +7638,7 @@ Documented changes and release timestamp
 * New -as mkisofs options --efi-boot, -eltorito-alt-boot
 
 
-2010.05.04.120115  []
+2010.05.04.120115  [3213]
 configure.ac
 README
 libisoburn/libisoburn.h
@@ -7650,21 +7650,358 @@ xorriso/xorriso_eng.html
 xorriso/make_xorriso_standalone.sh
 xorriso/configure_ac.txt
 xorriso/xorriso_timestamp.h
-Version leap to libisoburn-0.5.4
+Version leap to libisoburn-0.5.7
 
-04 May 2010  []
+04 May 2010  [3214]
 xorriso/changelog.txt
 Documented changes and release timestamp
 
+04 May 2010  [3215]
+svn move -m Promoted branch to tag
+http://svn.libburnia-project.org/libisoburn/branches/ZeroFiveSix
+http://svn.libburnia-project.org/libisoburn/tags/ZeroFiveSix
+
 ------------------------------------ cycle  - xorriso-0.5.7 - 2010.05.04.120115
 
------------------------------------- cycle  - xorriso-0.5.7 - 
------------------------------------- cycle  - xorriso-0.5.7 - 
+
+2010.05.05.194248  [3216]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+Removed development macro Xorriso_multi_booT by making it unconditional
+
+05 May 2010  [3217]
+xorriso/xorriso_eng.html
+Avoided to show inappropriate links on www.gnu.org
+
+------------------------------------ cycle  - xorriso-0.5.7 - 2010.05.05.194248
+
+
+2010.05.15.184604  [3218]
+Makefile.am
+xorriso/xorriso_makefile_am.txt
+xorriso/make_xorriso_standalone.sh
+xorriso/compile_xorriso.sh
+xorriso/xorriso.h
+xorriso/xorriso_private.h
+xorriso/xorrisoburn.h
+- xorriso/xorriso.c
+- xorriso/xorrisoburn.c
++ xorriso/xorriso_main.c
++ xorriso/sfile.h
++ xorriso/sfile.c
++ xorriso/aux_objects.h
++ xorriso/aux_objects.c
++ xorriso/findjob.h
++ xorriso/findjob.c
++ xorriso/check_media.h
++ xorriso/check_media.c
++ xorriso/misc_funct.h
++ xorriso/misc_funct.c
++ xorriso/text_io.h
++ xorriso/text_io.c
++ xorriso/match.h
++ xorriso/match.c
++ xorriso/emulators.h
++ xorriso/emulators.c
++ xorriso/disk_ops.h
++ xorriso/disk_ops.c
++ xorriso/cmp_update.h
++ xorriso/cmp_update.c
++ xorriso/parse_exec.h
++ xorriso/parse_exec.c
++ xorriso/opts_a_c.c
++ xorriso/opts_d_h.c
++ xorriso/opts_i_o.c
++ xorriso/opts_p_z.c
++ xorriso/base_obj.h
++ xorriso/base_obj.c
++ xorriso/lib_mgt.h
++ xorriso/lib_mgt.c
++ xorriso/sort_cmp.h
++ xorriso/sort_cmp.c
++ xorriso/drive_mgt.h
++ xorriso/drive_mgt.c
++ xorriso/iso_img.h
++ xorriso/iso_img.c
++ xorriso/iso_tree.h
++ xorriso/iso_tree.c
++ xorriso/iso_manip.h
++ xorriso/iso_manip.c
++ xorriso/write_run.h
++ xorriso/write_run.c
++ xorriso/read_run.h
++ xorriso/read_run.c
++ xorriso/filters.h
++ xorriso/filters.c
+Splitted xorriso.c and xorrisoburn.c into smaller source modules
+
+2010.05.16.092546  [3220]
+libisoburn/burn_wrap.c
+libisoburn/data_source.c
+libisoburn/isoburn.c
+libisoburn/isofs_wrap.c
+Eventually including ../config.h generated by autotools
+
+2010.05.16.093108  [3221]
+xorriso/aux_objects.c
+xorriso/base_obj.c
+xorriso/check_media.c
+xorriso/cmp_update.c
+xorriso/disk_ops.c
+xorriso/drive_mgt.c
+xorriso/emulators.c
+xorriso/filters.c
+xorriso/findjob.c
+xorriso/iso_img.c
+xorriso/iso_manip.c
+xorriso/iso_tree.c
+xorriso/lib_mgt.c
+xorriso/make_xorriso_1.c
+xorriso/match.c
+xorriso/misc_funct.c
+xorriso/opts_a_c.c
+xorriso/opts_d_h.c
+xorriso/opts_i_o.c
+xorriso/opts_p_z.c
+xorriso/parse_exec.c
+xorriso/read_run.c
+xorriso/sfile.c
+xorriso/sort_cmp.c
+xorriso/text_io.c
+xorriso/write_run.c
+xorriso/xorriso_main.c
+Eventually including ../config.h generated by autotools
+
+2010.05.16.113100  [3222]
+xorriso/xorriso.h
+xorriso/xorriso_main.c
+xorriso/make_xorriso_standalone.sh
+Made option -version know again whether it is in GNU xorriso
+
+2010.05.16.171056  [3223]
+xorriso/xorriso_main.c
+Checking for suitable sizeof(off_t)
+
+2010.05.17.142656  [3224]
++ xorriso/xorriso_bootstrap.txt
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+xorriso/xorriso_makefile_am.txt
+Made compilation of GNU xorriso less verbous by use of autoheader config.h
+
+2010.05.18.174455  [3225]
+Makefile.am
+- xorriso/makefile_libxorriso_am.txt
+xorriso/xorriso_main.c
+Moved xorriso implementation into libisoburn 
+
+19 May 2010  [3226]
+test/compare_file.c
+Eventually including ../config.h generated by autotools
+
+2010.05.19.160540  [3227]
+configure.ac
+Makefile.am
+xorriso/compile_xorriso.sh
+Moved configuration options from xorriso_xorriso_CFLAGS to CFLAGS
+
+2010.05.21.132725  [3228]
+libisoburn/libisoburn.h
+Mentioned both levels of API and their mutual exclusiveness
+
+2010.05.21.133627  [3229]
+xorriso/xorriso.h
+xorriso/xorriso_main.c
+xorriso/base_obj.c
+xorriso/opts_p_z.c
+xorriso/write_run.c
+Adapted version checking to new library situation
+
+2010.05.21.134500  [3230]
+libisoburn/libisoburn.h
+Corrected typo in remark
+
+2010.05.23.072450  [3231]
+libisoburn/libisoburn.h
+libisoburn/isoburn.h
+libisoburn/isoburn.c
+New write extension option isoburn_igopt_no_emul_toc
+
+2010.05.23.072616  [3232]
+xorriso/xorriso_private.h
+xorriso/base_obj.c
+xorriso/write_run.c
+New -compliance rule no_emul_toc
+
+2010.05.23.072845  [3233]
+xorriso/emulators.c
+Implemented -as cdrecord -V, new -as mkisofs option --no-emul-toc
+
+23 May 2010 [3234]
+xorriso/xorriso.texi
+xorriso/xorriso.1
+xorriso/xorriso.info
+Documentation for recent enhancements
+
+2010.05.26.123017  [3235]
+xorriso/emulators.c
+Implemented -as mkisofs options -U, -N, -l, -d, -allow-lowercase
+
+26 May 2010  [3236]
+xorriso/xorriso_eng.html
+Updated GNU xorriso web page
+
+------------------------------------ cycle  - xorriso-0.5.7 - 2010.05.26.123017
+* xorriso source split into more modules, object code moved into libisoburn
+* New write extension option isoburn_igopt_no_emul_toc
+* New -compliance rule no_emul_toc, new -as mkisofs --no-emul-toc
+* Implemented -as cdrecord -V
+* Implemented -as mkisofs options -U, -N, -l, -d, -allow-lowercase
+
+
+2010.05.31.095756  [3238]
+xorriso/aux_objects.h
+xorriso/aux_objects.c
+Corrected a misplaced class description comment
+
+2010.06.07.180414  [3242]
+xorriso/xorriso_makefile_am.txt
+Taking care of new Solaris adapter of libburn
+
+07 Jun 2010  [3243]
+README
+xorriso/README_gnu_xorriso
+xorriso/xorriso_eng.html
+Updated documentation about Solaris adapter
+
+------------------------------------ cycle  - xorriso-0.5.7 - 2010.06.07.180414
+* New libburn system adapter for Solaris uscsi (tested on snv134, kernel 5.11)
+
+
+10 Jun 2010  [3249]
+xorriso/README_gnu_xorriso
+xorriso/xorriso.texi
+xorriso/xorriso.1
+xorriso/xorriso.info
+Mentioned Solaris and system dependent drive permission settings
+
+2010.06.11.174804  [3258]
+configure.ac
+libisoburn/libisoburn.h
+Requiring libburn-0.8.2 now
+
+11 Jun 2010  [3259]
+xorriso/configure_ac.txt
+Adapted xorriso-standalone to version leap libburn-0.8.3
+
+------------------------------------ cycle  - xorriso-0.5.7 - 2010.06.11.174804
+
+
+2010.06.13.105645  [3260]
+xorriso/emulators.c
+Removed surplus test expression
+
+2010.06.13.110316  [3261]
+README
+xorriso/xorriso.h
+xorriso/xorriso_main.c
+Updated docs about existence of xorriso API in libisoburn
+
+2010.06.13.133537  [3261]
+xorriso/opts_d_h.c
+xorriso/xorriso.texi
+xorriso/xorriso.info
+xorriso/xorriso.1
+Untangled messed-up relation between -hardlinks and -compliance
+
+13 Jun 2010 [3263]
+svn copy -m Branching for libisoburn release 0.5.8
+http://svn.libburnia-project.org/libisoburn/trunk
+http://svn.libburnia-project.org/libisoburn/branches/ZeroFiveEight
+
+2010.06.13.140001  [3264]
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README_gnu_xorriso
+xorriso/xorriso.h
+xorriso/xorrisoburn.h
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+xorriso/xorriso_timestamp.h
+Version leap to libisoburn-0.5.8
+
+13 Jun 2010  [3265]
+xorriso/opts_p_z.c
+Avoided double printing of xorriso version header line
+
+  []
+xorriso/changelog.txt
+Documented changes and release timestamp
+
+----------------------------------- release - xorriso-0.5.8 - 2010.06.13.140001
+* New libburn system adapter for Solaris uscsi (tested on snv134, kernel 5.11)
+* xorriso source split into more modules, object code moved into libisoburn
+* New write extension option isoburn_igopt_no_emul_toc
+* New -compliance rule no_emul_toc, new -as mkisofs --no-emul-toc
+* Implemented -as cdrecord -V
+* Implemented -as mkisofs options -U, -N, -l, -d, -allow-lowercase
+
+
+  []
+xorriso/opts_p_z.c
+Avoided double printing of xorriso version header line
+
+  []
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README_gnu_xorriso
+xorriso/xorriso.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+xorriso/xorriso_timestamp.h
+Version leap to libisoburn-0.5.7
+
+  []
+xorriso/changelog.txt
+Documented changes and release timestamp
+
+  []
+svn move -m Promoted branch to tag
+http://svn.libburnia-project.org/libisoburn/branches/ZeroFiveEight
+http://svn.libburnia-project.org/libisoburn/tags/ZeroFiveEight
+
+------------------------------------ cycle  - xorriso-0.5.9 - 
+
+
+------------------------------------ cycle  - xorriso-0.5.9 - 
+------------------------------------ cycle  - xorriso-0.5.9 - 
 
 ===============================================================================
                                     TODO
 ===============================================================================
 
+------------------------------------------------- For Solaris
+
+libreadline does not know that it needs
+libcurses. (On Linux and on FreeBSD it
+links -lcurses automatically.)
+I need a smarter ./configure test. 
+
+The OS adapter header os-dummy.h for general
+X/Open systems does not know that it shall
+ignore SIGWINCH (which libreadline throws). 
+
+The mount command needs to be adapted to Solaris.
+(What is possible, at all ?)
+
+
 ------------------------------------------------- For GRUB
 
 - multi-boot management
@@ -7679,9 +8016,8 @@ Documented changes and release timestamp
   - warn that multiple boot images work only if they stem from
     distinct disk files
 
+- Option to avoid TOC-emulation and save 64 to 126 kB
 
-- move most of xorriso into libisoburn
-  - split up xorriso.c and xorrisoburn.c into smaller modules
 
 ------------------------------------------------- FreeBSD
 
@@ -7690,6 +8026,8 @@ Documented changes and release timestamp
 
 ------------------------------------------------- bugs
 
+- xorriso_eng.html on www.gnu.org it should rather be xorriso.html
+
 - DVD-ROM drives report CD tracks with size up to the next track start.
   Why ? -> libburn
   Eventually restrict -check_media to ISO image size ?