diff --git a/src/warden-server/doc/warden.mysql b/src/warden-server/doc/warden.mysql
index 48a298232103f71148c97a8b8ecd3f43bc7b4af3..3b862179b3d0b58e25d5d2c6b62066fec8a6c95c 100644
--- a/src/warden-server/doc/warden.mysql
+++ b/src/warden-server/doc/warden.mysql
@@ -41,6 +41,7 @@ CREATE TABLE `clients` (
   `receive_own_events` varchar(1) default NULL,
   `description_tags` varchar(256) default NULL,
   `ip_net_client` varchar(256) default NULL,
+  `valid` varchar(1) DEFAULT NULL,
   PRIMARY KEY  (`client_id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -54,8 +55,6 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `events` (
   `id` int(11) NOT NULL auto_increment,
-  `hostname` varchar(256) default NULL,
-  `service` varchar(64) default NULL,
   `detected` timestamp NOT NULL default '0000-00-00 00:00:00',
   `received` timestamp NOT NULL default '0000-00-00 00:00:00',
   `type` varchar(64) default NULL,
@@ -68,6 +67,7 @@ CREATE TABLE `events` (
   `priority` int(1) unsigned default NULL,
   `timeout` int(2) unsigned default NULL,
   `valid` varchar(1) default NULL,
+  `client_id` int(11) DEFAULT NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
diff --git a/src/warden-server/doc/warden20to21.patch b/src/warden-server/doc/warden20to21.patch
deleted file mode 100644
index bf9c15fd92573c5b31eb2e16285634a53d40431a..0000000000000000000000000000000000000000
--- a/src/warden-server/doc/warden20to21.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE  `clients` CHANGE  `registered`  `registered` TIMESTAMP NOT NULL DEFAULT  '0000-00-00 00:00:00';
-
-ALTER TABLE  `events` 
-CHANGE  `detected`  `detected` TIMESTAMP NOT NULL DEFAULT  '0000-00-00 00:00:00',
-CHANGE  `target_port`  `target_port` INT( 2 ) UNSIGNED DEFAULT NULL ,
-CHANGE  `attack_scale`  `attack_scale` INT( 4 ) UNSIGNED DEFAULT NULL ,
-CHANGE  `priority`  `priority` INT( 1 ) UNSIGNED DEFAULT NULL ,
-CHANGE  `timeout`  `timeout` INT( 2 ) UNSIGNED DEFAULT NULL;
diff --git a/src/warden-server/doc/warden21to22.patch b/src/warden-server/doc/warden21to22.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b4092c8100af04f9a246044506584183298f681b
--- /dev/null
+++ b/src/warden-server/doc/warden21to22.patch
@@ -0,0 +1,7 @@
+ALTER TABLE  `clients`
+ADD `valid` varchar(1) DEFAULT NULL;
+
+ALTER TABLE  `events`
+DROP COLUMN `hostname`,
+DROP COLUMN `service`,
+ADD `client_id` int(11) DEFAULT NULL;