diff --git a/xorriso/make_xorriso_standalone.sh b/xorriso/make_xorriso_standalone.sh
index 4198149c..c3b1de97 100755
--- a/xorriso/make_xorriso_standalone.sh
+++ b/xorriso/make_xorriso_standalone.sh
@@ -134,6 +134,8 @@ copy_files \
 
 copy_files xorriso/xorriso_buildstamp_none.h \
            "$lone_dir"/xorriso/xorriso_buildstamp.h
+copy_files xorriso/xorriso_buildstamp_none.h \
+           "$lone_dir"/xorriso/xorriso_buildstamp_none.h
 
 create_dir "$lone_dir"/test
 copy_files \
diff --git a/xorriso/xorriso_makefile_am.txt b/xorriso/xorriso_makefile_am.txt
index 47bc5ef6..5d31a514 100644
--- a/xorriso/xorriso_makefile_am.txt
+++ b/xorriso/xorriso_makefile_am.txt
@@ -56,9 +56,9 @@ xorriso_xorriso_SOURCES = \
 	libisoburn/burn_wrap.c \
 	libisoburn/data_source.c \
 	\
+	libisofs/libisofs.h \
 	libisofs/builder.h \
 	libisofs/builder.c \
-	libisofs/error.h \
 	libisofs/node.h \
 	libisofs/node.c \
 	libisofs/tree.h \
@@ -70,7 +70,6 @@ xorriso_xorriso_SOURCES = \
 	libisofs/fsource.h \
 	libisofs/fsource.c \
 	libisofs/fs_local.c \
-	libisofs/fs_image.h \
 	libisofs/fs_image.c \
 	libisofs/messages.h \
 	libisofs/messages.c \
@@ -89,6 +88,7 @@ xorriso_xorriso_SOURCES = \
 	libisofs/ecma119_tree.h \
 	libisofs/ecma119_tree.c \
 	libisofs/writer.h \
+	libisofs/buffer.h \
 	libisofs/buffer.c \
 	libisofs/rockridge.h \
 	libisofs/rockridge.c \
@@ -236,8 +236,15 @@ EXTRA_DIST = \
 	xorriso/changelog.txt \
 	xorriso/xorriso_buildstamp_none.h \
 	$(man_MANS) \
+	doc/susp_aaip_2_0.txt \
+	doc/susp_aaip_isofs_names.txt \
+	doc/zisofs_format.txt \
 	libisofs/aaip-os-dummy.c \
 	libisofs/aaip-os-linux.c \
-	libisofs/aaip-os-freebsd.c
-	
-
+	libisofs/aaip-os-freebsd.c \
+	libburn/os-dummy.h \
+	libburn/os-freebsd.h \
+	libburn/os-linux.h \
+	libburn/sg-dummy.c \
+	libburn/sg-freebsd.c \
+	libburn/sg-linux.c
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 569b3d66..7a8438f3 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.04.15.185359"
+#define Xorriso_timestamP "2009.04.16.145617"