diff --git a/test/make_xorriso_standalone.sh b/test/make_xorriso_standalone.sh
index c54b799e..67776ac8 100755
--- a/test/make_xorriso_standalone.sh
+++ b/test/make_xorriso_standalone.sh
@@ -63,7 +63,6 @@ create_dir "$lone_dir"
 copy_files \
  AUTHORS \
  CONTRIBUTORS \
- TODO \
  acinclude.m4 \
  aclocal.m4 \
  bootstrap \
@@ -81,17 +80,15 @@ copy_files \
  \
  "$lone_dir"
 
-copy_files \
- test/configure_ac.txt \
- "$lone_dir"/configure.ac
+copy_files test/configure_ac.txt         "$lone_dir"/configure.ac
 
-copy_files \
- test/xorriso_makefile_am.txt \
- "$lone_dir"/Makefile.am
+copy_files test/xorriso_makefile_am.txt  "$lone_dir"/Makefile.am
 
-copy_files \
- test/xorriso_pc_in.txt \
- "$lone_dir"/xorriso.pc.in
+copy_files test/xorriso_pc_in.txt        "$lone_dir"/xorriso.pc.in
+
+copy_files test/README                   "$lone_dir"/README
+
+cat "See end of xorriso/changelog.txt" >"$lone_dir"/TODO
 
 
 # libisoburn
@@ -103,17 +100,17 @@ copy_files \
 
 create_dir "$lone_dir"/xorriso
 copy_files \
- test/compile_xorriso.sh \
  test/ng_xorrisoburn.[ch] \
  test/xorriso.[ch1] \
  test/xorriso_private.h \
  test/xorriso_timestamp.h \
+ test/changelog.txt \
  "$lone_dir"/xorriso
 
 mv "$lone_dir"/xorriso/ng_xorrisoburn.h "$lone_dir"/xorriso/xorrisoburn.h
 mv "$lone_dir"/xorriso/ng_xorrisoburn.c "$lone_dir"/xorriso/xorrisoburn.c
 
-# >>> patch compile_xorriso.sh for standalone
+# >>> create compile_xorriso.sh for standalone
 
 
 # nglibisofs
@@ -122,6 +119,24 @@ create_dir "$lone_dir"/libisofs
 goto_dir   "$current_dir"/nglibisofs-develop
 copy_files src/*.[ch] "$lone_dir"/libisofs
 
+# Filter out the semi-illegal TODO comments 
+( cd "$lone_dir"/libisofs && grep '^[[:space:]]*//' *.[ch] | less )
+echo "Is it ok delete all shown //-lines ?"
+read yesno
+if test "$yesno" = "y" -o "$yesno" = "1"
+then
+  for i in "$lone_dir"/libisofs/*.[ch]
+  do
+    # first copy attributes
+    cp "$i" "$lone_dir"/libisofs/tmpfile
+    # now filter away // lines
+    grep -v '^[[:space:]]*//' <"$i" >"$lone_dir"/libisofs/tmpfile && \
+      mv "$lone_dir"/libisofs/tmpfile "$i"
+  done
+fi
+echo "Remaining // lines:"
+( cd "$lone_dir"/libisofs && grep '//' *.[ch] )
+
 
 # libburn
 
@@ -129,6 +144,7 @@ create_dir "$lone_dir"/libburn
 goto_dir   "$current_dir"/libburn-develop
 copy_files libburn/*.[ch] "$lone_dir"/libburn
 
+copy_files COPYING        "$lone_dir"/COPYING
 
 echo "Done"
 echo "HINT: Now build xorriso/xorriso by:"