diff --git a/packages/build-server.sh b/packages/build-server.sh
index a4baf38f12bcafbd5f2f9933830ba37ae6d79dca..37f0c0fb7ed5a7413b1480ab13b85a5a9ae7d0f5 100755
--- a/packages/build-server.sh
+++ b/packages/build-server.sh
@@ -12,7 +12,8 @@ err()
 {
   echo "FAILED!"
   cat "$err"
-  rm -f "$err" "$package" "$tar" "$sig"
+  rm -f "$err" "$tar" "$sig"
+  rm -rf "$package"
   echo
   echo "Build of $package package FAILED!!!"
   exit 1
@@ -71,7 +72,7 @@ echo "OK"
 
 echo -n "Building '${etc}' directory ... "
 mkdir -p "$etc" 2> "$err" || err
-cp "../src/${package_name}/etc/*" "$etc" 2> "$err" || err
+cp "../src/${package_name}/etc/"* "$etc" 2> "$err" || err
 rm -f "${etc}/"*.conf 2> "$err" || err
 echo "OK"