diff --git a/packages/build-client.sh b/packages/build-client.sh
index dfe9a89374faaf8273413019f283401b92c1cd16..4383cb44a5ba70996d7ce960e4e762c6d5eda92a 100755
--- a/packages/build-client.sh
+++ b/packages/build-client.sh
@@ -3,35 +3,10 @@
 # build-client.sh
 #
 # Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s):    Tomas PLESNIK   <plesnik@ics.muni.cz>
-#               Jan SOUKAL      <soukal@ics.muni.cz>
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the Cesnet z.s.p.o nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#     this software without specific prior written permission.
-#
-# This software is provided ``as is'', and any express or implied
-# warranties, including, but not limited to, the implied warranties of
-# merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Cesnet z.s.p.o or contributors be liable for
-# any direct, indirect, incidental, special, exemplary, or consequential
-# damages (including, but not limited to, procurement of substitute
-# goods or services; loss of use, data, or profits; or business
-# interruption) however caused and on any theory of liability, whether
-# in contract, strict liability, or tort (including negligence or
-# otherwise) arising in any way out of the use of this software, even
-# if advised of the possibility of such damage.
-
-VERSION="1.1"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="1.2"
 
 #-------------------------------------------------------------------------------
 #				FUNCTIONS
@@ -52,17 +27,17 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="2.0.0-beta"
+version="2.0.0-beta2"
 
 package_name="warden-client"
-package="$package_name-$version"
-doc="$package/$package_name/doc"
-etc="$package/$package_name/etc"
-lib="$package/$package_name/lib"
-var="$package/$package_name/var"
-tar="$package.tar.gz"
-sig="$tar.sig"
-err="/tmp/$package-err"
+package="${package_name}-${version}"
+doc="${package}/${package_name}/doc"
+etc="${package}/${package_name}/etc"
+lib="${package}/${package_name}/lib"
+var="${package}/${package_name}/var"
+tar="${package}.tar.gz"
+sig="${tar}.sig"
+err="/tmp/${package}-err"
 
 # make directory structure
 echo "Building $package_name package version $version ..."
@@ -70,34 +45,34 @@ echo
 
 echo -n "Building 'base' directory ... "
 mkdir -p $package 2> $err || err
-cp -R ../src/$package_name/sh/* $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/README.cesnet $package 2> $err || err
+cp -R ../src/${package_name}/sh/* $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/README.cesnet $package 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$doc' directory ... "
+echo -n "Building '${doc}' directory ... "
 mkdir -p $doc 2> $err || err
-cp -R ../src/$package_name/doc/* $doc 2> $err || err
+cp -R ../src/${package_name}/doc/* $doc 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$etc' directory ... "
+echo -n "Building '${etc}' directory ... "
 mkdir -p $etc 2> $err || err
-cp ../src/$package_name/etc/package_version $etc 2> $err || err
+cp ../src/${package_name}/etc/package_version $etc 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$lib' directory ... "
+echo -n "Building '${lib}' directory ... "
 mkdir -p $lib 2> $err || err
-cp -R ../src/$package_name/lib/* $lib 2> $err || err
+cp -R ../src/${package_name}/lib/* $lib 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$var' directory ... "
+echo -n "Building '${var}' directory ... "
 mkdir -p $var 2> $err || err
 echo "OK"
 
diff --git a/packages/build-server.sh b/packages/build-server.sh
index 8e4fdedba61c75c13da94165fff69dbfc8e51b0c..451554fe7d523a4f5a1f227d8a9ed167ebed8e14 100755
--- a/packages/build-server.sh
+++ b/packages/build-server.sh
@@ -3,35 +3,10 @@
 # build-server.sh
 #
 # Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s):    Tomas PLESNIK   <plesnik@ics.muni.cz>
-#               Jan SOUKAL      <soukal@ics.muni.cz>
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the Cesnet z.s.p.o nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#     this software without specific prior written permission.
-#
-# This software is provided ``as is'', and any express or implied
-# warranties, including, but not limited to, the implied warranties of
-# merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Cesnet z.s.p.o or contributors be liable for
-# any direct, indirect, incidental, special, exemplary, or consequential
-# damages (including, but not limited to, procurement of substitute
-# goods or services; loss of use, data, or profits; or business
-# interruption) however caused and on any theory of liability, whether
-# in contract, strict liability, or tort (including negligence or
-# otherwise) arising in any way out of the use of this software, even
-# if advised of the possibility of such damage.
-
-VERSION="1.0"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="1.1"
 
 err()
 {
@@ -49,18 +24,18 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="0.1.1"
+version="2.0.0-beta1"
 
 package_name="warden-server"
-package="$package_name-$version"
-bin="$package/$package_name/bin"
-doc="$package/$package_name/doc"
-etc="$package/$package_name/etc"
-lib="$package/$package_name/lib"
-var="$package/$package_name/var"
-tar="$package.tar.gz"
-sig="$tar.sig"
-err="/tmp/$package-err"
+package="${package_name}-${version}"
+bin="${package}/${package_name}/bin"
+doc="${package}/${package_name}/doc"
+etc="${package}/${package_name}/etc"
+lib="${package}/${package_name}/lib"
+var="${package}/${package_name}/var"
+tar="${package}.tar.gz"
+sig="${tar}.sig"
+err="/tmp/${package}-err"
 
 # make directory structure
 echo "Building $package_name package version $version ..."
@@ -68,39 +43,37 @@ echo
 
 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/uninstall.sh $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/README.warden-apache $package 2> $err || err
+cp ../src/{$package_name}/sh/install.sh $package 2> $err || err
+cp ../src/{$package_name}/sh/uninstall.sh $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
 
 echo "OK"
 
-echo -n "Building '$bin' directory ... "
+echo -n "Building '${bin}' directory ... "
 mkdir -p $bin 2> $err || err
-cp -R ../src/$package_name/bin/* $bin 2> $err || err
-cp -R ../src/$package_name/sh/create_tables.sh $bin 2> $err || err
+cp -R ../src/${package_name}/bin/* $bin 2> $err || err
 echo "OK"
 
-echo -n "Building '$doc' directory ... "
+echo -n "Building '${doc}' directory ... "
 mkdir -p $doc 2> $err || err
-cp -R ../src/$package_name/doc/* $doc 2> $err || err
+cp -R ../src/${package_name}/doc/* $doc 2> $err || err
 echo "OK"
 
-echo -n "Building '$etc' directory ... "
+echo -n "Building '${etc}' directory ... "
 mkdir -p $etc 2> $err || err
-cp ../src/$package_name/etc/package_version $etc 2> $err || err
-cp ../src/$package_name/etc/warden-apache.conf $etc 2> $err || err
+cp ../src/${package_name}/etc/package_version $etc 2> $err || err
+cp ../src/${package_name}/etc/warden-apache.conf $etc 2> $err || err
 echo "OK"
 
-echo -n "Building '$lib' directory ... "
+echo -n "Building '${lib}' directory ... "
 mkdir -p $lib 2> $err || err
-cp -R ../src/$package_name/lib/* $lib 2> $err || err
+cp -R ../src/${package_name}/lib/* $lib 2> $err || err
 echo "OK"
 
-echo -n "Building '$var' directory ... "
+echo -n "Building '${var}' directory ... "
 mkdir -p $var 2> $err || err
 echo "OK"