diff --git a/src/warden-server/bin/getClients.pl b/src/warden-server/bin/getClients.pl
index b1640a1b0d29f65bbfd01b592949fe807ae36edf..c490b092d9ec5f43e6fe5790d328013ba852ec8d 100755
--- a/src/warden-server/bin/getClients.pl
+++ b/src/warden-server/bin/getClients.pl
@@ -35,6 +35,8 @@ use strict;
use Getopt::Std;
use File::Basename;
+our $VERSION = "1.0";
+
my $warden_path = '/opt/warden-server';
require $warden_path . '/lib/WardenStatus.pm';
my $filename = basename($0);
diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl
index 60fe4611e1c9b3c07a8bc3e8d96e43368355a89e..c2976c3011ba780f1fedad0868920c3ecc98745e 100755
--- a/src/warden-server/bin/getStatus.pl
+++ b/src/warden-server/bin/getStatus.pl
@@ -35,7 +35,7 @@ use strict;
use Getopt::Std;
use File::Basename;
-our $VERSION = "1.0.0";
+our $VERSION = "1.0";
my $warden_path = '/opt/warden-server';
require $warden_path . '/lib/WardenStatus.pm';
diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl
index dff795bf391c5b716c0890a19bca0673c1662f23..3a9af8228b8fd8b4526e33c5a31bbace674ef2bb 100755
--- a/src/warden-server/bin/registerReceiver.pl
+++ b/src/warden-server/bin/registerReceiver.pl
@@ -36,6 +36,8 @@ use Getopt::Std;
use Switch;
use File::Basename;
+our $VERSION = "1.0";
+
my $warden_path = '/opt/warden-server';
require $warden_path . '/lib/WardenReg.pm';
my $filename = basename($0);
diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl
index 2f3c9c698f6b2c51111cdf10645c9955df9646ae..225f88bd22226adba7b6917ad822cb634d5e6baa 100755
--- a/src/warden-server/bin/registerSender.pl
+++ b/src/warden-server/bin/registerSender.pl
@@ -36,6 +36,8 @@ use Getopt::Std;
use Switch;
use File::Basename;
+our $VERSION = "1.0";
+
my $warden_path = '/opt/warden-server';
require $warden_path . '/lib/WardenReg.pm';
my $filename = basename($0);
diff --git a/src/warden-server/bin/unregisterClient.pl b/src/warden-server/bin/unregisterClient.pl
index 254971285168c52d97e2b7c125e0d5f1a1b861ac..711932de56bb3032489af2b20cc9c5b160a78e60 100755
--- a/src/warden-server/bin/unregisterClient.pl
+++ b/src/warden-server/bin/unregisterClient.pl
@@ -36,6 +36,8 @@ use Getopt::Std;
use Switch;
use File::Basename;
+our $VERSION = "1.0";
+
my $warden_path = '/opt/warden-server';
require $warden_path . '/lib/WardenReg.pm';
my $filename = basename($0);
diff --git a/src/warden-server/bin/warden-alive b/src/warden-server/bin/warden-alive
index 140f96a6579cf7f4a2f21c225d8bf60a1adaef74..f7d8998b5ce8472fef124a008530fe8282fb99cc 100755
--- a/src/warden-server/bin/warden-alive
+++ b/src/warden-server/bin/warden-alive
@@ -1,4 +1,36 @@
#!/usr/bin/perl
+#
+# warden-alive
+#
+# Copyright (C) 2011 Cesnet z.s.p.o
+# Author(s): Jan Mach <jan.mach@cesnet.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.
+
+our $VERSION = "1.0";
my $rv = `ps aux | grep "/usr/bin/perl -w /opt/warden-server/bin/warden-server.pl" | grep -v grep | grep -v process-alive | wc -l`;
if ($rv) {
diff --git a/src/warden-server/bin/wardend b/src/warden-server/bin/wardend
index 56531845e0e3372e208d7f42966a34b6b70cc562..92625b5546d0388f947b7496a1138c06fdd5b55c 100755
--- a/src/warden-server/bin/wardend
+++ b/src/warden-server/bin/wardend
@@ -42,6 +42,8 @@
# among CSIRT teams
### END INIT INFO
+VERSION="1.0"
+
DAEMON="/opt/warden-server/bin/warden-server.pl"
PID_FILE="/var/run/warden-server.pl.pid"
LOCK_FILE="/var/lock/warden-server"
diff --git a/src/warden-server/lib/WardenConf.pm b/src/warden-server/lib/WardenConf.pm
index bdb64ca7dda233ab82bf0f790395dafbe9ad5e92..5f8156c48fb1b17df9f4ad9d52e294fc61004342 100755
--- a/src/warden-server/lib/WardenConf.pm
+++ b/src/warden-server/lib/WardenConf.pm
@@ -36,7 +36,7 @@ package WardenConf;
use strict;
-our $VERSION = 100;
+our $VERSION = "1.0";
#-------------------------------------------------------------------------------
# loadConf - load variables from configuration file
diff --git a/src/warden-server/lib/WardenReg.pm b/src/warden-server/lib/WardenReg.pm
index 9a9478ffcf56abc1ff2be04ac02712949568b88b..6ef131d68eb2d136d0865ccd73b41ff5859c6808 100755
--- a/src/warden-server/lib/WardenReg.pm
+++ b/src/warden-server/lib/WardenReg.pm
@@ -38,7 +38,7 @@ use SOAP::Lite;
use IO::Socket::SSL qw(debug1);
use SOAP::Transport::TCP;
-our $VERSION = 100;
+our $VERSION = "1.0";
#-------------------------------------------------------------------------------
diff --git a/src/warden-server/lib/WardenStatus.pm b/src/warden-server/lib/WardenStatus.pm
index 6c2f53452f9f34347c752c4df35aa42d2dfd6441..abbf837d3805e0f1827492df8959d95939b70331 100755
--- a/src/warden-server/lib/WardenStatus.pm
+++ b/src/warden-server/lib/WardenStatus.pm
@@ -38,7 +38,7 @@ use SOAP::Lite;
use IO::Socket::SSL qw(debug1);
use SOAP::Transport::TCP
-our $VERSION = "1.0.0";
+our $VERSION = "1.0";
#-------------------------------------------------------------------------------
# errMsg - print error message and die
diff --git a/src/warden-server/sh/create_table.sh b/src/warden-server/sh/create_table.sh
index 00ff5445be5fb3bcda4837b16da94930222ef6ae..136ca3d831e9ce4ec56389f875b0781734778a47 100755
--- a/src/warden-server/sh/create_table.sh
+++ b/src/warden-server/sh/create_table.sh
@@ -31,6 +31,7 @@
# otherwise) arising in any way out of the use of this software, even
# if advised of the possibility of such damage.
+VERSION="1.0"
sqlite=`which sqlite3`
db_file="/opt/warden-server/var/warden.db"