diff --git a/libisoburn/trunk/ChangeLog b/libisoburn/trunk/ChangeLog
index b85cde9c..f266f829 100644
--- a/libisoburn/trunk/ChangeLog
+++ b/libisoburn/trunk/ChangeLog
@@ -1,7 +1,10 @@
-SVN trunk (to become libisoburn-1.0.8.pl00.tar.gz)
+SVN trunk (to become libisoburn-1.1.0.pl00.tar.gz)
 ===============================================================================
 - no novelties yet
 
+libisoburn-1.0.8.pl00.tar.gz  Thu Apr 14 2011
+===============================================================================
+* Bug fix: mkisofs emulation could ignore options (regression in 0.1.6)
 
 libisoburn-1.0.6.pl00.tar.gz  Sat Apr 9 2011
 ===============================================================================
diff --git a/libisoburn/trunk/xorriso/changelog.txt b/libisoburn/trunk/xorriso/changelog.txt
index 1475506a..1e8328ae 100644
--- a/libisoburn/trunk/xorriso/changelog.txt
+++ b/libisoburn/trunk/xorriso/changelog.txt
@@ -10324,21 +10324,92 @@ xorriso/configure_ac.txt
 xorriso/xorriso_timestamp.h
 Version leap to libisoburn-1.0.7
 
+09 Apr 2011  [3724]
+ChangeLog
+xorriso/changelog.txt
+Documented changes and release timestamp
+
+09 Apr 2011  [3725]
+svn move -m Promoted branch to tag
+http://svn.libburnia-project.org/libisoburn/branches/1.0.6
+http://svn.libburnia-project.org/libisoburn/tags/1.0.6
+
+------------------------------------ cycle  - xorriso-1.0.7 - 2011.04.09.105219
+
+
+2011.04.13.204236  [3726]
+xorriso/emulators.c
+Bug fix: mkisofs emulation could ignore options (regression in 0.1.6)
+
+14 Apr 2011  [3727]
+svn copy -m Branching for libisoburn release 1.0.8
+http://svn.libburnia-project.org/libisoburn/trunk
+http://svn.libburnia-project.org/libisoburn/branches/1.0.8
+
+2011.04.15.073001  [3278]
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README_gnu_xorriso
+xorriso/xorriso.h
+xorriso/xorrisoburn.h
+xorriso/xorriso_main.c
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+xorriso/xorriso_timestamp.h
+Version leap to libisoburn-1.0.8
+
+14 Apr 2011  [3729]
+ChangeLog
+xorriso/changelog.txt
+Documented changes and release timestamp
+
+2011.04.14.073001  [3730]
+xorriso/xorriso_timestamp.h
+ChangeLog
+xorriso/changelog.txt
+Corrected release date 
+
+----------------------------------- release - xorriso-1.0.8 - 2011.04.13.073001
+* Bug fix: mkisofs emulation could ignore options (regression in 0.1.6)
+
+
+2011.04.14.081721  [3731]
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README_gnu_xorriso
+xorriso/xorriso.h
+xorriso/xorrisoburn.h
+xorriso/xorriso_main.c
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+xorriso/xorriso_timestamp.h
+Version leap to libisoburn-1.0.9
+
   []
 ChangeLog
 xorriso/changelog.txt
 Documented changes and release timestamp
 
+  []
+svn move -m Promoted branch to tag
+http://svn.libburnia-project.org/libisoburn/branches/1.0.8
+http://svn.libburnia-project.org/libisoburn/tags/1.0.8
+
+
 
 xorriso/xorriso_eng.html
 ChangeLog
 Updated change log and web page
------------------------------------- cycle  - xorriso-1.0.5 - 
 
+------------------------------------ cycle  - xorriso-1.0.9 - 
 xorriso/xorriso_eng.html
 ChangeLog
 Updated change log and web page
------------------------------------- cycle  - xorriso-1.0.5 - 
+------------------------------------ cycle  - xorriso-1.0.9 - 
 
 
 **********************************************************************
@@ -10350,6 +10421,13 @@ Important: When adding a public API function then add its name to file
                                     TODO
 ===============================================================================
 
+- Does not do anything:
+   xorriso -as mkisofs -o /dvdbuffer/image.iso /u/x 
+  This works
+   xorriso -as mkisofs -o /dvdbuffer/image.iso -J /u/x 
+
+- Make Debian test machine ready for cppcheck and add it to release procedure
+
 - ? Allow to adjust maximum path length
 
 - Is libisofs rockridge.c safe for >250 chars in all cases ?