diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c
index f81e2e0b..8b872787 100644
--- a/xorriso/xorriso.c
+++ b/xorriso/xorriso.c
@@ -6416,12 +6416,12 @@ int Xorriso_option_commit_eject(struct XorrisO *xorriso, char *which, int flag)
  int ret, eret;
 
  ret= Xorriso_option_commit(xorriso, 1);
- if(ret<=0 || ret==2)
+ if(ret<=0 || ret==2 || ret==3)
    return(ret);
  if(strcmp(which, "none")==0 || strcmp(which, "")==0)
    eret= 1;
  else
-   eret= Xorriso_option_eject(xorriso, which, 0);
+   eret= Xorriso_option_eject(xorriso, which, 1);
  ret= Xorriso_option_dev(xorriso, "", 3|4);
  if(eret<ret)
    return(eret);
@@ -6653,6 +6653,8 @@ int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag)
 
 
 /* Option -eject */
+/* @param flag bit0=do not report toc of eventually remaining drives
+*/
 int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag)
 {
  int gu_flag= 4, ret;
@@ -6669,6 +6671,8 @@ int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag)
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
    return(0);
  }
+ if(flag&1)
+   gu_flag|= 8;
  ret= Xorriso_give_up_drive(xorriso, gu_flag);
  return(ret);
 }
diff --git a/xorriso/xorriso.h b/xorriso/xorriso.h
index 6f840efa..1b599867 100644
--- a/xorriso/xorriso.h
+++ b/xorriso/xorriso.h
@@ -149,7 +149,9 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag);
 
 /* Option -add */
-/* @param flag bit0=do not report the added item */
+/* @param flag bit0=do not report the added item
+               bit1=do not reset pacifier
+*/
 int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
                        int *idx, int flag);
 
@@ -243,6 +245,8 @@ int Xorriso_option_disk_pattern(struct XorrisO *xorriso, char *mode, int flag);
 int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag);
 
 /* Option -eject */
+/* @param flag bit0=do not report toc of eventually remaining drives
+*/
 int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag);
 
 /* Options -end , and -rollback_end */
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 5a384103..b7170844 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.08.195627"
+#define Xorriso_timestamP "2008.02.08.215113"