diff --git a/packages/build-server.sh b/packages/build-server.sh
index 37f0c0fb7ed5a7413b1480ab13b85a5a9ae7d0f5..af3d021c81e6da2ce6b597376a35776f6c6e7b5e 100755
--- a/packages/build-server.sh
+++ b/packages/build-server.sh
@@ -33,10 +33,11 @@ fi
 
 package_name="warden-server"
 package="${package_name}-$1"
-bin="${package}/${package_name}/bin"
-doc="${package}/${package_name}/doc"
-etc="${package}/${package_name}/etc"
-lib="${package}/${package_name}/lib"
+bin="${package}/bin"
+doc="${package}/doc"
+etc="${package}/etc"
+lib="${package}/lib"
+sh="${package}/sh"
 tar="${package}.tar.gz"
 sig="${tar}.sig"
 err="/tmp/${package}-err"
@@ -49,13 +50,11 @@ echo -n "Building 'base' directory ... "
 mkdir -p "$package" 2> "$err" || err
 cp "../src/${package_name}/sh/install.sh" "$package" 2> "$err" || err
 cp "../src/${package_name}/sh/update.sh" "$package" 2> "$err" || err
-cp "../src/${package_name}/sh/uninstall.sh" "$package" 2> "$err" || err
 cp "../src/${package_name}/doc/AUTHORS" "$package" 2> "$err" || err
 cp "../src/${package_name}/doc/CHANGELOG" "$package" 2> "$err" || err
 cp "../src/${package_name}/doc/INSTALL" "$package" 2> "$err" || err
 cp "../src/${package_name}/doc/LICENSE" "$package" 2> "$err" || err
 cp "../src/${package_name}/doc/README" "$package" 2> "$err" || err
-cp "../src/${package_name}/doc/UNINSTALL" "$package" 2> "$err" || err
 cp "../src/${package_name}/doc/UPDATE" "$package" 2> "$err" || err
 
 echo "OK"
@@ -82,6 +81,11 @@ cp -R "../src/${package_name}/lib/"* "$lib" 2> "$err" || err
 rm -f "${lib}/"*.t 2> "$err" || err
 echo "OK"
 
+echo -n "Building '${sh}' directory ... "
+mkdir -p "$sh" 2> "$err" || err
+cp "../src/${package_name}/sh/uninstall.sh" "$sh" 2> "$err" || err
+echo "OK"
+
 
 # create tarball
 echo -n "Creating $tar tarball ... "