diff --git a/libisoburn/trunk/xorriso/drive_mgt.c b/libisoburn/trunk/xorriso/drive_mgt.c
index f6733469..bc279213 100644
--- a/libisoburn/trunk/xorriso/drive_mgt.c
+++ b/libisoburn/trunk/xorriso/drive_mgt.c
@@ -329,6 +329,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
  Sectorbitmap_destroy(&(xorriso->in_sector_map), 0);
  Xorriso_destroy_hln_array(xorriso, 0);
  Xorriso_destroy_di_array(xorriso, 0);
+ xorriso->boot_count= 0;
 
  /* check for invalid state */
  if(state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE &&
diff --git a/libisoburn/trunk/xorriso/iso_img.c b/libisoburn/trunk/xorriso/iso_img.c
index 59f53da5..a3f4597a 100644
--- a/libisoburn/trunk/xorriso/iso_img.c
+++ b/libisoburn/trunk/xorriso/iso_img.c
@@ -85,6 +85,7 @@ int Xorriso_create_empty_iso(struct XorrisO *xorriso, int flag)
    Xorriso_destroy_hln_array(xorriso, 0);
    xorriso->loaded_volid[0]= 0;
    xorriso->volset_change_pending= 0;
+   xorriso->boot_count= 0;
    xorriso->no_volset_present= 0;
  }
 
@@ -108,6 +109,7 @@ int Xorriso_create_empty_iso(struct XorrisO *xorriso, int flag)
  xorriso->in_sector_map= NULL;
  Xorriso_update_volid(xorriso, 0);
  xorriso->volset_change_pending= 0;
+ xorriso->boot_count= 0;
  xorriso->no_volset_present= 0;
  return(1);
 }
@@ -508,13 +510,7 @@ int Xorriso_boot_image_status(struct XorrisO *xorriso, char *filter, FILE *fp,
  }
  if(bin_path_in_use) {
    is_default= !xorriso->boot_image_cat_hidden;
-   hpt= "on";
-   if(xorriso->boot_image_cat_hidden == 0)
-     hpt= "off";
-   else if(xorriso->boot_image_cat_hidden == 1)
-     hpt= "iso_rr";
-   else if(xorriso->boot_image_cat_hidden == 2)
-     hpt= "joliet";
+   hpt= Xorriso__hide_mode_text(xorriso->boot_image_cat_hidden & 3, 0);
    sprintf(line, "-boot_image %s cat_hidden=%s\n", form, hpt);
    if(!(is_default && no_defaults))
      Xorriso_status_result(xorriso,filter,fp,flag&2);
diff --git a/libisoburn/trunk/xorriso/lib_mgt.c b/libisoburn/trunk/xorriso/lib_mgt.c
index 338287ce..cc41e829 100644
--- a/libisoburn/trunk/xorriso/lib_mgt.c
+++ b/libisoburn/trunk/xorriso/lib_mgt.c
@@ -203,6 +203,7 @@ int Xorriso_detach_libraries(struct XorrisO *xorriso, int flag)
    Sectorbitmap_destroy(&(xorriso->in_sector_map), 0);
    Xorriso_destroy_di_array(xorriso, 0);
    Xorriso_destroy_hln_array(xorriso, 0);
+   xorriso->boot_count= 0;
  }
  if(flag&1) {
    if(xorriso->libs_are_started==0)
diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h
index a14eee1a..b656fae0 100644
--- a/libisoburn/trunk/xorriso/xorriso_private.h
+++ b/libisoburn/trunk/xorriso/xorriso_private.h
@@ -211,8 +211,8 @@ struct XorrisO { /* the global context of xorriso */
  int do_calm_drive;      /* bit0= calm down drive after aquiring it */
 
  char indev[SfileadrL];
- void *in_drive_handle;  /* interpreted only by xorrisoburn.c */
- void *in_volset_handle; /* interpreted only by xorrisoburn.c */
+ void *in_drive_handle;  /* interpreted only by libburnia oriented modules */
+ void *in_volset_handle; /* interpreted only by libburnia oriented modules */
  char *in_charset;       /* The charset to interpret the filename bytes */
  int indev_is_exclusive;
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index cf4e4675..70a80a6d 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.06.23.152337"
+#define Xorriso_timestamP "2010.06.23.175357"