diff --git a/copy-jdk-configs.spec b/copy-jdk-configs.spec
index 891cb58..4f3ae00 100644
--- a/copy-jdk-configs.spec
+++ b/copy-jdk-configs.spec
@@ -8,7 +8,7 @@ Name:    copy-jdk-configs
 # hash relevant to version tag
 %global  htag 3f9d6c4448f867a95fb166416a41c45c7e795c10
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: JDKs configuration files copier
 
 License:  BSD
@@ -72,6 +72,9 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
 %license LICENSE
 
 %changelog
+* Wed Feb 22 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3
+- updated to latest head
+
 * Wed Feb 22 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2
 - added "jre/lib/security/blacklisted.certs" to cared files
 
diff --git a/copy_jdk_configs.lua b/copy_jdk_configs.lua
index 4c00d0f..02b94b3 100755
--- a/copy_jdk_configs.lua
+++ b/copy_jdk_configs.lua
@@ -112,7 +112,39 @@ local caredFiles = {"jre/lib/calendars.properties",
               "jre/lib/security/nss.cfg",
               "jre/lib/security/cacerts",
               "jre/lib/security/blacklisted.certs",
-              "jre/lib/ext"}
+              "jre/lib/ext",
+              "lib/calendars.properties",
+              "lib/content-types.properties",
+              "lib/flavormap.properties",
+              "lib/logging.properties",
+              "lib/net.properties",
+              "lib/psfontj2d.properties",
+              "lib/sound.properties",
+              "lib/deployment.properties",
+              "lib/deployment.config",
+              "lib/security/US_export_policy.jar",
+              "lib/security/java.policy",
+              "lib/security/java.security",
+              "lib/security/local_policy.jar",
+              "lib/security/nss.cfg",
+              "lib/security/cacerts",
+              "lib/security/blacklisted.certs",
+              "lib/security/default.policy",
+              "conf/security/policy/limited/exempt_local.policy",
+              "conf/security/policy/limited/default_local.policy",
+              "conf/security/policy/limited/default_US_export.policy",
+              "conf/security/policy/unlimited/default_local.policy",
+              "conf/security/policy/unlimited/default_US_export.policy",
+              "conf/security/java.policy",
+              "conf/security/java.security",
+              "conf/logging.properties",
+              "conf/security/nss.cfg",
+              "conf/management/jmxremote.access",
+              "conf/management/jmxremote.password.template",
+              "conf/management/management.properties",
+              "conf/net.properties",
+              "conf/sound.properties",
+              "lib/ext"}
 
 function splitToTable(source, pattern)
   local i1 = string.gmatch(source, pattern) 
@@ -151,7 +183,11 @@ for i,p in pairs(foundJvms) do
       end;
       return
     end ;
-    table.insert(jvms, p)
+    if (string.match(p, ".*-debug$")) then
+      print(p.." matched but seems to be debug variant. Skipping")
+    else
+      table.insert(jvms, p)
+    end
   else
     if (debug) then
       print("NOT matched:  "..p)
diff --git a/copy_jdk_configs_fixFiles.sh b/copy_jdk_configs_fixFiles.sh
index f045189..d027784 100755
--- a/copy_jdk_configs_fixFiles.sh
+++ b/copy_jdk_configs_fixFiles.sh
@@ -134,6 +134,19 @@ files=`find $source | grep "\\.rpmsave$"`
   done
 
 
+#warning: file /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-11.b12.el7.x86_64-debug/jre/lib/applet: remove failed: No such file or directory
+#warning: file /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-11.b12.el7.x86_64-debug/jre/lib/amd64/client: remove failed: No such file or directory
+#those dirs might be mepty by installtion, filling to not be rmeoved later
+blackdirs="$source/jre/lib/applet $source/jre/lib/*/client"
+for blackdir in $blackdirs; do
+  if [ -e $blackdir ] ; then
+    debug "nasty $blackdir  exists, filling"
+    touch $blackdir/C-J-C_placeholder
+  else
+    debug "nasty $blackdir  DONT exists, ignoring"
+  fi
+done
+
 debug "cleaning legacy leftowers"
 if [ "x$debug" == "xtrue" ] ; then
   find $source -empty -type d -delete
@@ -143,4 +156,14 @@ else
   rmdir $rma $source 2>/dev/null >/dev/null
 fi
 
+# and remove placeholders
+for blackdir in $blackdirs; do
+  if [ -e $blackdir ] ; then
+    debug "nasty $blackdir  exists, cleaning placeholder"
+    rm $blackdir/C-J-C_placeholder
+  else
+    debug "nasty $blackdir  DONT exists, ignoring again"
+  fi
+done
+
 clean