diff --git a/dibi/dibi.php b/dibi/dibi.php
index cb7541e6..0f42a5c5 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -4,17 +4,26 @@
  * dibi - Database Abstraction Layer according to dgx
  * --------------------------------------------------
  *
- * For PHP 5.0.3 or newer
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * This source file is subject to the GNU GPL license.
+ * for PHP 5.0.3 and newer
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    0.7g $Revision$ $Date$
+ * @link      http://dibi.texy.info/
+ * @license   GNU GENERAL PUBLIC LICENSE version 2
+ * @package   dibi
+ * @category  Database
+ * @version   2.0 beta (Revision: $WCREV$, Date: $WCDATE$)
+ * @version   0.7g (Revision: $WCREV$, Date: $WCDATE$)
+ */
+
+
+/**
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
+ *
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
+ *
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index ab470a43..c6d94688 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 5f29fff9..c5ab96a2 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 884c6988..cf4427b3 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index fdb130ee..fd5d1834 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index d14349f0..555a8abb 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 8cb3cd62..dfd956be 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/libs/driver.php b/dibi/libs/driver.php
index 1504a966..bbfe7167 100644
--- a/dibi/libs/driver.php
+++ b/dibi/libs/driver.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/libs/exception.php b/dibi/libs/exception.php
index a5a5c968..598fca47 100644
--- a/dibi/libs/exception.php
+++ b/dibi/libs/exception.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/libs/resultset.php b/dibi/libs/resultset.php
index 56078d89..33b5805f 100644
--- a/dibi/libs/resultset.php
+++ b/dibi/libs/resultset.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/dibi/libs/translator.php b/dibi/libs/translator.php
index 65bec0e6..93438232 100644
--- a/dibi/libs/translator.php
+++ b/dibi/libs/translator.php
@@ -1,18 +1,12 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * This source file is subject to the GNU GPL license.
+ * Copyright (c) 2005-2007 David Grudl aka -dgx- <dave@dgx.cz>
  *
- * @author     David Grudl aka -dgx- <dave@dgx.cz>
- * @link       http://dibi.texy.info/
- * @copyright  Copyright (c) 2005-2007 David Grudl
- * @license    GNU GENERAL PUBLIC LICENSE v2
- * @package    dibi
- * @category   Database
- * @version    $Revision$ $Date$
+ * @version  $Revision$ $Date$
+ * @package  dibi
  */
 
 
diff --git a/version.txt b/version.txt
index 01dd9c10..327cd465 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1,4 @@
-Dibi Version 0.7g
+Dibi version 0.7g
+
+Revision: $WCREV$
+Date: $WCDATE$