diff --git a/libisoburn/trunk/test/make_xorriso_standalone.sh b/libisoburn/trunk/test/make_xorriso_standalone.sh
index ba6fcbe9..74f3ed68 100755
--- a/libisoburn/trunk/test/make_xorriso_standalone.sh
+++ b/libisoburn/trunk/test/make_xorriso_standalone.sh
@@ -5,18 +5,26 @@
 #
 # Creates a standalone tree for building xorriso
 # from the contents of a unified libburnia development tree.
+# The ./bootstrap script gets applied and a source tarball
+# is made.
+#
 # To be executed in the parent of the *-develop directories.
 #
 # From that tree can be build a binary xorriso/xorriso
 # which at runtime depends only on libc and libpthread.
 # Execute in $lone_dir :
 #
-#   ./bootstrap && ./configure && make
+#   ./configure && make
 #
 
 current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
+xorriso_rev=0.1.0
+xorriso_pl=".pl00"
+
+with_bootstrap_tarball=1
+
 create_dir() {
   if mkdir "$1"
   then
@@ -150,7 +158,45 @@ copy_files libburn/*.[ch] "$lone_dir"/libburn
 
 copy_files COPYING        "$lone_dir"/COPYING
 
+
+# tarball
+
+if test "$with_bootstrap_tarball" = 1
+then
+
+tarball_dir="$current_dir"/xorriso-"$xorriso_rev"
+mv "$lone_dir" "$tarball_dir"
+
+goto_dir "$tarball_dir"
+
+./bootstrap
+
+# Remove unneeded temporary data from ./bootstrap
+rm -r ./autom4te.cache
+
+# Repair non-portable shell code output of ./bootstrap
+(
+ cd "$compile_dir" || exit 1
+ sed -e 's/^for ac_header in$/test -z 1 \&\& for ac_header in dummy/' \
+     < ./configure > ./configure-repaired
+ if test "$?" = 0
+ then
+   echo "$0: Empty 'for ac_header in' found in configure." >&2
+ fi
+ mv ./configure-repaired ./configure
+ chmod a+rx,go-w,u+w ./configure
+)
+
+cd "$current_dir"
+tar czf ./xorriso-"$xorriso_rev""$xorriso_pl".tar.gz $(basename "$tarball_dir")
+
+ls -l $(pwd)/xorriso-"$xorriso_rev""$xorriso_pl".tar.gz
+        
+mv "$tarball_dir" "$lone_dir"
+
+fi
+
 echo "Done"
 echo "HINT: Now build xorriso/xorriso by:"
-echo "        cd '$lone_dir' && ./bootstrap && ./configure && make"
+echo "        cd '$lone_dir' && ./configure && make"
 echo
diff --git a/libisoburn/trunk/test/xorriso_eng.html b/libisoburn/trunk/test/xorriso_eng.html
index d35a9a64..a5cabb02 100644
--- a/libisoburn/trunk/test/xorriso_eng.html
+++ b/libisoburn/trunk/test/xorriso_eng.html
@@ -141,10 +141,10 @@ may accept pathspecs of form target=source as known from program mkisofs.</DT>
 
 <HR>
 
-<DT>Get info about a particular drive or loaded media:</DT>
-<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -toc</KBD></DD>
+<DT>Get info about a particular drive and loaded media:</DT>
+<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
 
-<DT>Make re-usable media writable from scratch again:</DT>
+<DT>Make re-usable media writable again, delete any ISO 9660 image:</DT>
 <DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -blank fast -eject all</KBD></DD>
 
 <DT>
@@ -155,6 +155,9 @@ may accept pathspecs of form target=source as known from program mkisofs.</DT>
 <DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -add /home/me/sounds /home/me/pictures
 </KBD></DD>
 
+<DT>Check the result:</DT>
+<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
+
 <DT>
 <HR>
 </DT>