diff --git a/libisoburn/trunk/test/xorriso.c b/libisoburn/trunk/test/xorriso.c
index 458e4b2d..73dba65e 100644
--- a/libisoburn/trunk/test/xorriso.c
+++ b/libisoburn/trunk/test/xorriso.c
@@ -25,6 +25,17 @@
 
 #define PROG_VERSION "0.0.0"
 
+/** The source code release timestamp */
+#include "xorriso_timestamp.h"
+#ifndef Xorriso_timestamP
+#define Xorriso_timestamP "-none-given-"
+#endif
+
+/** The binary build timestamp is to be set externally by the compiler */
+#ifndef Xorriso_build_timestamP
+#define Xorriso_build_timestamP "-none-given-"
+#endif
+
 #include <ctype.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -77,7 +88,20 @@
 typedef int (*Cleanup_app_handler_T)();
 
 
-/* Include this in code that uses xorriso via its options API */
+/* ------------------------------------------------------------------------ */
+
+/* The library which does the ISO 9660 / RockRidge manipulations */
+#include <libisofs/libisofs.h>
+
+/* The library which does MMC optical drive operations */
+#include <libburn/libburn.h>
+
+/* The library which enhances overwriteable media with ISO 9660 multi-session
+   capabilities via the method invented by Andy Polyakov for growisofs */
+#include <libisoburn/libisoburn.h>
+
+
+/* The official xorriso options API. "No shortcuts" */
 #include "xorriso.h"
 
 
@@ -3957,6 +3981,9 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag)
 {
  printf("xorriso %s : RockRidge filesystem manipulator\n", PROG_VERSION);
  printf("Copyright (C) 2007, Thomas Schmitt <scdbackup@gmx.net>, libburnia project\n");
+ printf("Version timestamp :  %s\n",Xorriso_timestamP);
+ printf("Build timestamp   :  %s\n",Xorriso_build_timestamP);
+
  return(1);
 }
 
diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h
index 33346a63..579d41da 100644
--- a/libisoburn/trunk/test/xorriso_timestamp.h
+++ b/libisoburn/trunk/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2007.10.12.221407"
+#define Xorriso_timestamP "2007.10.12.231015"