diff --git a/cdrskin/cdrskin_eng.html b/cdrskin/cdrskin_eng.html
index 8657e7f..d019447 100644
--- a/cdrskin/cdrskin_eng.html
+++ b/cdrskin/cdrskin_eng.html
@@ -99,8 +99,10 @@ wishes as well as on the development of libburn.</DT>
 <DD>$ cdrskin -v dev=/dev/dvd blank=fast -eject</DD>
 <DT>Write ISO-9660 filesystem image:</DT>
 <DD>$ cdrskin -v dev=/dev/hdc speed=12 fs=8m driveropts=burnfree -sao -eject padsize=300k my_image.iso</DD>
-<DT>Write compressed afio archive on-the-fly:</DT>
+<DT>Write compressed afio archive on-the-fly via cdrskin-0.2.4 :</DT>
 <DD>$ find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 driveropts=burnfree padsize=300k -sao tsize=650m -</DD>
+<DT>Write compressed afio archive on-the-fly via cdrskin-0.2.5 :</DT>
+<DD>$ find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 driveropts=burnfree padsize=300k -tao -</DD>
 <DT>Write audio tracks:</DT>
 <DD>$ cdrskin -v dev=ATA:1,0,0 speed=48 driveropts=burnfree -sao track1.wav track2.au -audio -swab track3.raw
 <DD>
@@ -126,9 +128,9 @@ wishes as well as on the development of libburn.</DT>
 Burns only a single closed session. No -multi option yet.
 </LI>
 <LI>
-No TAO mode and therefore no writing on-the-fly without a predefined 
-source size.<BR>
-Note: Development version 0.2.5 experimentally offers TAO now. See below.
+No TAO mode in cdrskin-0.2.4 and therefore no writing on-the-fly without
+a predefined source size.<BR>
+Note: Development version 0.2.5 offers TAO now. See below.
 </LI>
 <LI>
 cdrskin -scanbus or --devices hangs for quite a while if there is 
@@ -215,14 +217,15 @@ Enhancements towards previous stable version cdrskin-0.2.2:
 
 <P>
 <DL>
-<DT>Development snapshot, version 0.2.5 :</DT>
-<DD>&nbsp;</DD>
+<DT><H3>Development snapshot, version 0.2.5 :</H3></DT>
 <DD>Enhancements towards stable version 0.2.4:
  <UL>
- <LI>If compiled by <KBD>cdrskin/compile_cdrskin.sh -experimental</KBD>
-     option <KBD><B>-tao</B></KBD> is accepted for piping without a fixed size.
-     Tests with single data tracks went well. Audio tests are still pending.
+ <LI>Option <KBD><B>-tao</B></KBD> is fully enabled.
+     With single track or with undefined size from standard input,
+     default is -tao. With other multi-track sessions, default is -sao.
+     (The latter is an intentional deviation from cdrecord defaults.)
  </LI>
+ <LI>Status report during blank, preparation and finalization improved</LI>
  </UL>
 </DD>
 <DD>&nbsp;</DD>
diff --git a/cdrskin/changelog.txt b/cdrskin/changelog.txt
index 33d2a6a..fd2d166 100644
--- a/cdrskin/changelog.txt
+++ b/cdrskin/changelog.txt
@@ -1317,13 +1317,12 @@ Installed decent abort behavior with TAO
 libburn/write.c
 Enabled TAO for multiple -data tracks (-audio still ends after 0 bytes)
 
-
 2006.11.04.092909  [348]
 libburn/spc.c
 libburn/sector.c
 Enabled audio tracks with TAO
 
-2006.11.02.140329 (pl01)  [351]
+2006.11.02.140329 (pl01)  [351 tags/CdrskinZeroTwoFourPlZeroOne]
 ../cdrskin-0.2.4.patch01/configure.ac
 ../cdrskin-0.2.4.patch01/bootstrap
 ../cdrskin-0.2.4.patch01/cdrskin/README
@@ -1332,31 +1331,56 @@ Enabled audio tracks with TAO
 ../cdrskin-0.2.4.patch01/test/libburner.c
 Revoked autotools aspect of revision 290
 
-
-  []
+2006.11.06.073810  [352]
 cdrskin/cdrskin.c
 cdrskin/cdrskin_eng.html
 cdrskin/changelog.txt
 Adapted documentation to reflect experimental TAO mode
 
+------------------------------------ cycle  - cdrskin-0.2.5 - 2006.11.06.085056
 
------------------------------------- cycle  - cdrskin-0.2.5 - 2006.11.06       
+2006.11.06.114159  [353]
+libburn/libburn.h
+libburn/spc.c
+libburn/options.c
+cdrskin/cdrskin.c
+New API burn_write_opts_set_multi(). (But libburn cannot burn next session yet)
+
+2006.11.06.121409  [354]
+cdrskin/cdrskin.c
+Made -toc on multiple sessions more compatible
+
+2006.11.06.155237  [355]
+libburn/libburn.h
+libburn/drive.c
+libburn/write.c
+libburn/mmc.c
+libburn/sg-linux.c
+cdrskin/cdrskin.c
+Made CD with unclosed track blankable (by -force)
+
+2006.11.06.195743  [356]
+libburn/transport.h
+libburn/mmc.c
+libburn/spc.c
+libburn/write.c
+libburn/sg-linux.c
+Cared for some SCSI error conditions which were ignored up to now
+
+2006.11.07.114514  [357]
+cdrskin/cdrskin.c
+Made -tao default for single track or stdin, -sao for any other multi-track
+
+  []
+cdrskin/cdrskin_eng.html
+cdrskin/changelog.txt
+Prepared next cdrskin-0.2.5 upload cycle
+
+------------------------------------ cycle  - cdrskin-0.2.5 - 2006.11.07.
 
 
   []
-Have others test TAO with audio tracks
-
-
-  []
-Test empty input behavior with TAO
-
-
-  []
-Make CD with unclosed track blankable
-
-
-  []
-Allow -tao in cdrskin for 0.2.3 by default
+Check desired write and block type with burn_drive_info.*_block_types
 
 
   []