diff --git a/libisoburn/trunk/test/ng_xorrisoburn.c b/libisoburn/trunk/test/ng_xorrisoburn.c
index 2be3edd1..a94cfdba 100644
--- a/libisoburn/trunk/test/ng_xorrisoburn.c
+++ b/libisoburn/trunk/test/ng_xorrisoburn.c
@@ -2507,7 +2507,7 @@ int Xorriso_rename(struct XorrisO *xorriso, char *origin, char *dest, int flag)
 {
  int ret, ol, dest_ret;
  char sfe[5*SfileadrL], eff_dest[SfileadrL], dir_adr[SfileadrL], *cpt;
- char *leafname, eff_origin[SfileadrL], sfe2[5*SfileadrL];
+ char *leafname, eff_origin[SfileadrL], sfe2[5*SfileadrL], *old_leafname;
  IsoImage *volume;
  IsoDir *origin_dir, *dest_dir;
  IsoNode *node;
@@ -2620,7 +2620,10 @@ int Xorriso_rename(struct XorrisO *xorriso, char *origin, char *dest, int flag)
    leafname= eff_dest;
  else
    leafname++;
- ret= iso_node_set_name(node, leafname);
+ 
+ old_leafname= (char *) iso_node_get_name(node);
+ if(strcmp(leafname, old_leafname)!=0)
+   ret= iso_node_set_name(node, leafname);
  if(ret<0) {
    Xorriso_process_msg_queues(xorriso,0);
    sprintf(xorriso->info_text, "Internal error on rename: failed to set name");
diff --git a/libisoburn/trunk/test/xorriso.1 b/libisoburn/trunk/test/xorriso.1
index 33e65a79..0d5b8487 100644
--- a/libisoburn/trunk/test/xorriso.1
+++ b/libisoburn/trunk/test/xorriso.1
@@ -539,7 +539,9 @@ Like -chgrp but affecting all files below eventual directories.
 \fB\-chmod\fR mode iso_rr_path [***]
 Equivalent to shell command chmod in the ISO image.
 mode is either an octal number beginning with "0" or a comma separated
-list of statements of the form [ugoa]*[+-=][rwxst]* . Like: go-rwx,u+rwx .
+list of statements of the form [ugoa]*[+-=][rwxst]* .
+.br
+Like: go-rwx,u+rwx .
 .br
 .B Personalities:
 u=user, g=group, o=others, a=all
@@ -646,7 +648,7 @@ needs to get terminated by "--".
 \fB\-mkdir\fR iso_rr_path [...]
 Create empty directories if they do not exist yet.
 Existence as directory generates a WARNING event, existence as
-other file cause a SORRY event.
+other file causes a SORRY event.
 .TP
 \fB\-rmdir\fR iso_rr_path [***]
 Delete empty directories.
diff --git a/libisoburn/trunk/test/xorriso.c b/libisoburn/trunk/test/xorriso.c
index ea7f2a20..bde7c6cb 100644
--- a/libisoburn/trunk/test/xorriso.c
+++ b/libisoburn/trunk/test/xorriso.c
@@ -4992,7 +4992,7 @@ int Xorriso_convert_modstring(struct XorrisO *xorriso, char *cmd, char *mode,
    for(mpt= mode; mpt!=NULL; mpt= strchr(mpt, ',')) {
      if(*mpt==',')
        mpt++;
-     if(strlen(mpt)<3)
+     if(strlen(mpt)<2)
        goto unrecognizable;
      who_val= 0;
      for(vpt= mpt; *vpt!='+' && *vpt!='-' && *vpt!='='; vpt++) {
@@ -6483,7 +6483,7 @@ int Xorriso_option_commit(struct XorrisO *xorriso, int flag)
 int Xorriso_option_cpri(struct XorrisO *xorriso, int argc, char **argv,
                          int *idx, int flag)
 {
- int i, ret, is_dir= 0, was_failure= 0, fret;
+ int i, ret, is_dir= 0, was_failure= 0, fret, end_idx_dummy;
  char eff_origin[SfileadrL], eff_dest[SfileadrL];
  char dest_dir[SfileadrL], leafname[SfileadrL];
  int optc= 0;
@@ -6533,6 +6533,8 @@ problem_handler:;
  }
  ret= !was_failure;
 ex:;
+ Xorriso_opt_args(xorriso, "-cpri",
+                  argc, argv, *idx, &end_idx_dummy, &optc, &optv, 256);
  return(ret);
 }
 
@@ -7544,10 +7546,10 @@ ex:;
 int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
                       int *idx, int flag)
 {
- int i, end_idx, ret, is_dir= 0, was_failure= 0, fret;
+ int i, end_idx_dummy, ret, is_dir= 0, was_failure= 0, fret;
  char sfe[5*SfileadrL], sfe2[5*SfileadrL];
  char eff_origin[SfileadrL], eff_dest[SfileadrL], dest_dir[SfileadrL];
- char *leafname;
+ char leafname[SfileadrL];
  int optc= 0;
  char **optv= NULL;
 
@@ -7595,8 +7597,7 @@ problem_handler:;
  ret= !was_failure;
 ex:;
  Xorriso_opt_args(xorriso, "-mvi",
-                  argc, argv, *idx, &end_idx, &optc, &optv, 256);
- (*idx)= end_idx;
+                  argc, argv, *idx, &end_idx_dummy, &optc, &optv, 256);
  return(ret);
 }
 
diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h
index 39062947..bd7d9a9d 100644
--- a/libisoburn/trunk/test/xorriso_timestamp.h
+++ b/libisoburn/trunk/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.01.14.164628"
+#define Xorriso_timestamP "2008.01.14.190220"