diff --git a/packages/build-client.sh b/packages/build-client.sh
index 4383cb44a5ba70996d7ce960e4e762c6d5eda92a..4dfa24385cfa839be6476b0185c021a3ba7283c3 100755
--- a/packages/build-client.sh
+++ b/packages/build-client.sh
@@ -27,7 +27,7 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="2.0.0-beta2"
+version="2.0"
 
 package_name="warden-client"
 package="${package_name}-${version}"
diff --git a/src/warden-client/bin/receiver.pl b/src/warden-client/bin/receiver.pl
index 426e27d6ffcb4c841f8d682425daa383714fcda5..b303178169694d70be6f715862709cc3b91247eb 100755
--- a/src/warden-client/bin/receiver.pl
+++ b/src/warden-client/bin/receiver.pl
@@ -3,34 +3,8 @@
 # receiver.pl
 #
 # 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.
 #
+# Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use strict;
 
diff --git a/src/warden-client/bin/sender.pl b/src/warden-client/bin/sender.pl
index caedc70e0a6281ff7e604b58c10beca56d5b52f9..183d994f6fa300b179d01a62cc7eefe0c427b10e 100755
--- a/src/warden-client/bin/sender.pl
+++ b/src/warden-client/bin/sender.pl
@@ -3,34 +3,8 @@
 # sender.pl
 #
 # 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.
 #
+# Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use Switch;
 use strict;
diff --git a/src/warden-client/doc/CHANGELOG b/src/warden-client/doc/CHANGELOG
index 29b8cb0c52d3644fde34945d1e4bf92c8595fb4c..582b9c0f56d461e6686f7ca8e5ec2fb0f9cf817a 100644
--- a/src/warden-client/doc/CHANGELOG
+++ b/src/warden-client/doc/CHANGELOG
@@ -1,8 +1,9 @@
-2012-07-20 v.2.0.0-beta2 2nd beta version of warden-client-2.0.0
-----------------------------------------------------------------
+2012-07-27 v.2.0 stable version and bugfix release of warden-client-2.0.0-beta
+------------------------------------------------------------------------------
 - Sender client code fixed, so that it will not terminate "parent"
   application when crashed
 
+
 2012-05-10 v.2.0.0-beta beta version of warden-client-2.0.0
 -----------------------------------------------------------
 - Changed communication with server: HTTP layer added (compatible with
diff --git a/src/warden-client/doc/README b/src/warden-client/doc/README
index 3a09cf89a4b1f7e02d2201520bc083db592c1611..6477e13e90e12656dc288e170c5033366d64dde1 100644
--- a/src/warden-client/doc/README
+++ b/src/warden-client/doc/README
@@ -1,6 +1,6 @@
-+------------------------------------+
-| README - Warden Client 2.0.0-beta2 |
-+------------------------------------+
++----------------------------+
+| README - Warden Client 2.0 |
++----------------------------+
 
 Content
 
@@ -30,7 +30,7 @@ A. Overall Information
  
  2. Version
   
-    2.0.0-beta2 (2012-07-20)
+    2.0 (2012-07-27)
     
  3. Package structure
  
@@ -58,7 +58,7 @@ B. Installation Dependencies
   
     Perl                  >= 5.10.1  
     SOAP::Lite            >= 0.712
-    IO::Socket::SSL       >= 1.33
+    IO::Socket::SSL       >= 1.74
     SOAP::Transport::HTTP >= 0.712
     FindBin               >= 1.50
     DateTime              >= 0.61
@@ -69,11 +69,11 @@ C. Installation (First installation of the Warden client package)
 
  1. Check SHA1 checksum of corresponding Warden client package archive
 
-    $ sha1sum -c warden-client-2.0.0-beta2.tar.gz.sig
+    $ sha1sum -c warden-client-2.0.tar.gz.sig
 
  2. Untar it
 
-    $ tar xzvf warden-client-2.0.0-beta2.tar.gz
+    $ tar xzvf warden-client-2.0.tar.gz
 
  3. Run install.sh 
   
@@ -129,11 +129,11 @@ D. Update (Update of previously installed the Warden client package)
 
  1. Check SHA1 checksum of corresponding the Warden client package archive
 
-    $ sha1sum -c warden-client-2.0.0-beta2.tar.gz.sig
+    $ sha1sum -c warden-client-2.0.tar.gz.sig
 
  2. Untar it
 
-    $ tar xzvf warden-client-2.0.0-beta2.tar.gz
+    $ tar xzvf warden-client-2.0.tar.gz
 
  3. Run update.sh 
   
diff --git a/src/warden-client/doc/README.cesnet b/src/warden-client/doc/README.cesnet
index fb1f474bd3e00004c714920e047400cbd39ae17e..f4e69c1da5a4ab871d3c9b21333b88dbc957634a 100644
--- a/src/warden-client/doc/README.cesnet
+++ b/src/warden-client/doc/README.cesnet
@@ -1,8 +1,8 @@
-+-------------------------------------------+
-| README.cesnet - Warden Client 2.0.0-beta2 |
-|				            |
-| CESNET Specifics                          |
-+-------------------------------------------+
++-----------------------------------+
+| README.cesnet - Warden Client 2.0 |
+|				    |
+| CESNET Specifics                  |
++-----------------------------------+
 
 Content
 
@@ -26,7 +26,7 @@ A. Overall Information
 
  2. Version
 
-    2.0.0-beta2 (2012-07-20)
+    2.0 (2012-07-27)
 
 --------------------------------------------------------------------------------
 B. Registration
diff --git a/src/warden-client/doc/example-receiver.pl.txt b/src/warden-client/doc/example-receiver.pl.txt
index 7236548d03518741f5f4f644bfc04b1b4a4c117d..afe5e5125f6503329b4cd8de951f7fe984edc7f5 100644
--- a/src/warden-client/doc/example-receiver.pl.txt
+++ b/src/warden-client/doc/example-receiver.pl.txt
@@ -7,7 +7,7 @@
 use strict;
 
 #------------------------------------------------------------------------------
-# Warden 1.2.0. Client, Receiver, Example
+# Warden 2.0 Client, Receiver, Example
 #
 # Simple use of warden-client receiver functionality to download new events
 # from # Warden server. This code illustrates how to integrate warden-client
diff --git a/src/warden-client/doc/example-sender.pl.txt b/src/warden-client/doc/example-sender.pl.txt
index b0988177f135a3335c6087a59e4f4181602df4ad..24c6dd114c0441bfb6bff331bb8aa1ef9449b5c2 100644
--- a/src/warden-client/doc/example-sender.pl.txt
+++ b/src/warden-client/doc/example-sender.pl.txt
@@ -8,7 +8,7 @@ use strict;
 use DateTime;
 
 #-------------------------------------------------------------------------------
-# Warden 1.2.0. Client, Sender, Example 
+# Warden 2.0. Client, Sender, Example 
 #
 # Sample script using warden-client sending functionality. This example is not
 # intended to be a standalone script. It only shows how to use warden-client
diff --git a/src/warden-client/etc/package_version b/src/warden-client/etc/package_version
index e4f6fa2f36ede68da6746efb6f370def58006a55..0838c147d4a1a9e83932604f055f8581a406c63d 100644
--- a/src/warden-client/etc/package_version
+++ b/src/warden-client/etc/package_version
@@ -1 +1 @@
-warden-client-2.0.0-beta2
+warden-client-2.0
diff --git a/src/warden-client/lib/WardenClientReceive.pm b/src/warden-client/lib/WardenClientReceive.pm
index 0b7a3f5774862943b0a9f674a30963b06d9df45d..d95d39892fcafed55d0d64a723721eb42bb59bba 100755
--- a/src/warden-client/lib/WardenClientReceive.pm
+++ b/src/warden-client/lib/WardenClientReceive.pm
@@ -14,7 +14,7 @@ use IO::Socket::SSL qw(debug1);
 use SOAP::Transport::HTTP;
 use FindBin;
 
-our $VERSION = "2.0"; #first iteration after 'port to Apache'
+our $VERSION = "2.0";
 
 #-------------------------------------------------------------------------------
 # errMsg - print error message and die
@@ -31,12 +31,12 @@ sub errMsg
 #-------------------------------------------------------------------------------
 sub c2s 
 {
-  my $uri		        = shift;
+  my $uri		= shift;
   my $ssl_key_file	= shift;
   my $ssl_cert_file	= shift;
-  my $ssl_ca_file	  = shift;
-  my $method		    = shift;
-  my $data		      = shift;
+  my $ssl_ca_file	= shift;
+  my $method		= shift;
+  my $data		= shift;
 
   my $client;
   my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
@@ -76,8 +76,6 @@ sub c2s
 }
 
 
-
-
 #-------------------------------------------------------------------------------
 # getNewEvents - get new events from warden server greater than last received ID
 #-------------------------------------------------------------------------------
@@ -140,19 +138,19 @@ sub getNewEvents
     my @event;
 
     # parse items of one event
-    $id			       = $response_data->{'ID'};
-    $hostname		   = $response_data->{'HOSTNAME'};
-    $service		   = $response_data->{'SERVICE'};
-    $detected 	   = $response_data->{'DETECTED'};
-    $type		       = $response_data->{'TYPE'};
-    $source_type   = $response_data->{'SOURCE_TYPE'};
-    $source		     = $response_data->{'SOURCE'};
-    $target_proto	 = $response_data->{'TARGET_PROTO'};
-    $target_port	 = $response_data->{'TARGET_PORT'};
-    $attack_scale	 = $response_data->{'ATTACK_SCALE'};
-    $note		       = $response_data->{'NOTE'};
-    $priority		   = $response_data->{'PRIORITY'};
-    $timeout		   = $response_data->{'TIMEOUT'};
+    $id			= $response_data->{'ID'};
+    $hostname		= $response_data->{'HOSTNAME'};
+    $service		= $response_data->{'SERVICE'};
+    $detected		= $response_data->{'DETECTED'};
+    $type		= $response_data->{'TYPE'};
+    $source_type	= $response_data->{'SOURCE_TYPE'};
+    $source		= $response_data->{'SOURCE'};
+    $target_proto	= $response_data->{'TARGET_PROTO'};
+    $target_port	= $response_data->{'TARGET_PORT'};
+    $attack_scale	= $response_data->{'ATTACK_SCALE'};
+    $note		= $response_data->{'NOTE'};
+    $priority		= $response_data->{'PRIORITY'};
+    $timeout		= $response_data->{'TIMEOUT'};
 
     # push new event from warden server into @events which is returned
     @event = ($id, $hostname, $service, $detected, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout);
diff --git a/src/warden-client/lib/WardenClientSend.pm b/src/warden-client/lib/WardenClientSend.pm
index 6c5d0079b9f38d5eb0961480ff4deb05b35822e6..951ee4e7dd19cd1eda1762ac7606d71ef3a710fa 100755
--- a/src/warden-client/lib/WardenClientSend.pm
+++ b/src/warden-client/lib/WardenClientSend.pm
@@ -13,7 +13,7 @@ use SOAP::Lite;
 use IO::Socket::SSL qw(debug1);
 use SOAP::Transport::HTTP;
 
-our $VERSION = "2.0"; #first iteration after 'port to Apache'
+our $VERSION = "2.0";
 
 
 #-------------------------------------------------------------------------------
@@ -31,12 +31,12 @@ sub errMsg
 #-------------------------------------------------------------------------------
 sub c2s 
 {
-  my $uri		        = shift;
+  my $uri		= shift;
   my $ssl_key_file	= shift;
   my $ssl_cert_file	= shift;
-  my $ssl_ca_file	  = shift;
-  my $method		    = shift;
-  my $data		      = shift;
+  my $ssl_ca_file	= shift;
+  my $method		= shift;
+  my $data		= shift;
 
   my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
 
@@ -109,17 +109,17 @@ sub saveNewEvent
     # create SOAP data object
     my $event = SOAP::Data->name(
       event => \SOAP::Data->value(
-        SOAP::Data->name(SERVICE		  => $service),
-        SOAP::Data->name(DETECTED		  => $detected),
-        SOAP::Data->name(TYPE	    	  => $type),
-        SOAP::Data->name(SOURCE_TYPE  => $source_type),
-        SOAP::Data->name(SOURCE		    => $source),
+        SOAP::Data->name(SERVICE	=> $service),
+        SOAP::Data->name(DETECTED	=> $detected),
+        SOAP::Data->name(TYPE		=> $type),
+        SOAP::Data->name(SOURCE_TYPE	=> $source_type),
+        SOAP::Data->name(SOURCE		=> $source),
         SOAP::Data->name(TARGET_PROTO	=> $target_proto),
         SOAP::Data->name(TARGET_PORT	=> $target_port),
         SOAP::Data->name(ATTACK_SCALE	=> $attack_scale),
-        SOAP::Data->name(NOTE		      => $note),
-        SOAP::Data->name(PRIORITY     => $priority),
-        SOAP::Data->name(TIMEOUT		  => $timeout)
+        SOAP::Data->name(NOTE		=> $note),
+        SOAP::Data->name(PRIORITY	=> $priority),
+        SOAP::Data->name(TIMEOUT	=> $timeout)
       )
     );
 
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index f121a99a219a690f47828541572584658ee9412d..70d1bae2d508d474537553ae7ca23925930721db 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -233,7 +233,7 @@ change_permissions()
 #-------------------------------------------------------------------------------
 
 # list of used Perl modules
-modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::TCP FindBin DateTime)
+modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::HTTP FindBin DateTime)
 
 # read input
 while getopts "d:u:k:c:a:Vh" options; do
diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh
index 5590252bdbbde0598ff2b54743c8dc81e91d6923..62564995e430f832b9c16f00444134a246b4f1dd 100755
--- a/src/warden-client/sh/update.sh
+++ b/src/warden-client/sh/update.sh
@@ -239,7 +239,7 @@ change_permissions()
 #-------------------------------------------------------------------------------
 
 # list of used Perl modules
-modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::TCP FindBin DateTime)
+modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::HTTP FindBin DateTime)
 
 # read input
 while getopts "d:Vh" options; do