diff --git a/copy-jdk-configs.spec b/copy-jdk-configs.spec
index 538a274..04b064c 100644
--- a/copy-jdk-configs.spec
+++ b/copy-jdk-configs.spec
@@ -7,8 +7,8 @@ Name:    copy-jdk-configs
 
 # hash relevant to version tag
 %global  htag 3f9d6c4448f867a95fb166416a41c45c7e795c10
-Version: 2.1
-Release: 2%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 Summary: JDKs configuration files copier
 
 License:  BSD
diff --git a/copy_jdk_configs_fixFiles.sh b/copy_jdk_configs_fixFiles.sh
index 5f472a0..f045189 100755
--- a/copy_jdk_configs_fixFiles.sh
+++ b/copy_jdk_configs_fixFiles.sh
@@ -114,6 +114,33 @@ files=`find $source | grep "\\.rpmorig$"`
   for file in $files ; do
     rpmsaveTarget=`echo $file | sed "s/$srcName/$targetName/"`
     debug "relocating $file to $rpmsaveTarget"
-    mv $rma $file $rpmsaveTarget
+    if [ -e $rpmsaveTarget ] ; then
+      rm $rma $file
+    else
+      mv $rma $file $rpmsaveTarget
+    fi
   done
+
+debug "Working with rpmsave (1)"
+files=`find $source | grep "\\.rpmsave$"`
+  for file in $files ; do
+    rpmsaveTarget=`echo $file | sed "s/$srcName/$targetName/"`
+    debug "relocating $file to $rpmsaveTarget"
+    if [ -e $rpmsaveTarget ] ; then
+      rm $rma $file
+    else
+      mv $rma $file $rpmsaveTarget
+    fi
+  done
+
+
+debug "cleaning legacy leftowers"
+if [ "x$debug" == "xtrue" ] ; then
+  find $source -empty -type d -delete
+  rmdir $rma $source
+else
+  find $source -empty -type d -delete 2>/dev/null >/dev/null
+  rmdir $rma $source 2>/dev/null >/dev/null
+fi
+
 clean