diff --git a/src/warden-client/doc/README b/src/warden-client/doc/README
index 40b0a8062ba75160f3b9cbd1404af67496d45f22..7f5822319c7ca3411d2a9ba51b2aed3f4a717aa9 100644
--- a/src/warden-client/doc/README
+++ b/src/warden-client/doc/README
@@ -159,6 +159,21 @@ D. Update (Update of previously installed the Warden client package)
 
     Note: You must be root for running this script.
 
+ 6. Note that unlike version 2.1, in 2.2 the name of the file in which id of
+    the last received message is stored have changed. Previously, name was
+    "CALLER_NAME.id" (where CALLER_NAME is the name of calling script),
+    whereas now name contains name of requested message type
+    "CALLER_NAME-TYPE.id". 
+
+    Should you want to continue downloading events where previous version
+    left off, you will have to rename the file by hand. 
+
+    For example, where name of the file was "./var/example-receiver.pl.id"
+    and downloaded type was "portscan", new name should be
+    "./var/example-receiver.pl-portscan.id". If caller passes undef as
+    requested type to receive all types, new name should be
+    "./var/example-receiver.pl-any.id"
+
 
 --------------------------------------------------------------------------------
 E. Uninstallation
diff --git a/src/warden-client/lib/WardenClientReceive.pm b/src/warden-client/lib/WardenClientReceive.pm
index de274d826db7b381463a89034a0a9bde73004381..faf2d29b9fd2308d56b6b4858615c1502c3dfa3c 100755
--- a/src/warden-client/lib/WardenClientReceive.pm
+++ b/src/warden-client/lib/WardenClientReceive.pm
@@ -40,7 +40,7 @@ sub getNewEvents
 
     # set name of ID file for each client aplication 
     my $caller_name = $FindBin::Script;
-    my $id_file = $vardir . $caller_name . ".id";
+    my $id_file = $vardir . $caller_name . "-". ($requested_type || "any") . ".id";
 
     #-----------------------------------------------------------------------------
     # get last ID from ID file (if exist) or