diff --git a/dibi/dibi.php b/dibi/dibi.php
index 169a5ad..978c66c 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -1,12 +1,13 @@
 <?php
 
 /**
- * dibi - smart database abstraction layer.
+ * dibi - smart database abstraction layer (http://dibiphp.com)
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/drivers/firebird.php b/dibi/drivers/firebird.php
index ae3583a..ae09d0b 100644
--- a/dibi/drivers/firebird.php
+++ b/dibi/drivers/firebird.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index d72adb6..93a0062 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/mssql2005.php b/dibi/drivers/mssql2005.php
index be16e10..e90c6fc 100644
--- a/dibi/drivers/mssql2005.php
+++ b/dibi/drivers/mssql2005.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index c5737c8..a48ad42 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/mysql.reflector.php b/dibi/drivers/mysql.reflector.php
index e0d7e11..209f737 100644
--- a/dibi/drivers/mysql.reflector.php
+++ b/dibi/drivers/mysql.reflector.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index b791699..1f59ea1 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 8915519..434d141 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php
index 30b2096..9c3322d 100644
--- a/dibi/drivers/oracle.php
+++ b/dibi/drivers/oracle.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index 872ebbf..0a97464 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index 1ae8cfb..fb897b3 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 9aa8cf5..74d1bd4 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/sqlite.reflector.php b/dibi/drivers/sqlite.reflector.php
index c7e5830..60ae8d9 100644
--- a/dibi/drivers/sqlite.reflector.php
+++ b/dibi/drivers/sqlite.reflector.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/drivers/sqlite3.php b/dibi/drivers/sqlite3.php
index 7d38323..73b05f8 100644
--- a/dibi/drivers/sqlite3.php
+++ b/dibi/drivers/sqlite3.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index a2e2fb1..9f41d45 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiDataSource.php b/dibi/libs/DibiDataSource.php
index 47b355e..83e146a 100644
--- a/dibi/libs/DibiDataSource.php
+++ b/dibi/libs/DibiDataSource.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiDatabaseInfo.php b/dibi/libs/DibiDatabaseInfo.php
index b5fae13..f98d2c1 100644
--- a/dibi/libs/DibiDatabaseInfo.php
+++ b/dibi/libs/DibiDatabaseInfo.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiDateTime.php b/dibi/libs/DibiDateTime.php
index a502cfa..5f546c4 100644
--- a/dibi/libs/DibiDateTime.php
+++ b/dibi/libs/DibiDateTime.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiException.php b/dibi/libs/DibiException.php
index 88f35eb..68381a3 100644
--- a/dibi/libs/DibiException.php
+++ b/dibi/libs/DibiException.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
index c9e360f..d51439e 100644
--- a/dibi/libs/DibiFluent.php
+++ b/dibi/libs/DibiFluent.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiHashMap.php b/dibi/libs/DibiHashMap.php
index 0a0233c..fe6c1bf 100644
--- a/dibi/libs/DibiHashMap.php
+++ b/dibi/libs/DibiHashMap.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiObject.php b/dibi/libs/DibiObject.php
index 9d49b67..509135b 100644
--- a/dibi/libs/DibiObject.php
+++ b/dibi/libs/DibiObject.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiProfiler.php b/dibi/libs/DibiProfiler.php
index 8be087d..fd8be67 100644
--- a/dibi/libs/DibiProfiler.php
+++ b/dibi/libs/DibiProfiler.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index c3b6dad..cd2810f 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiResultIterator.php b/dibi/libs/DibiResultIterator.php
index 567eb66..35b62ae 100644
--- a/dibi/libs/DibiResultIterator.php
+++ b/dibi/libs/DibiResultIterator.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiRow.php b/dibi/libs/DibiRow.php
index b2fb0dd..1a5024a 100644
--- a/dibi/libs/DibiRow.php
+++ b/dibi/libs/DibiRow.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php
index 984b44a..6737f84 100644
--- a/dibi/libs/DibiTranslator.php
+++ b/dibi/libs/DibiTranslator.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/dibi/libs/interfaces.php b/dibi/libs/interfaces.php
index 3e46a60..6a42c15 100644
--- a/dibi/libs/interfaces.php
+++ b/dibi/libs/interfaces.php
@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
- * GPL license. For more information please see http://dibiphp.com
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 
diff --git a/license.txt b/license.txt
index 40e698d..365d945 100644
--- a/license.txt
+++ b/license.txt
@@ -1,62 +1,60 @@
-The Dibi License, Version 1
-============================
+Licenses
+========
 
-Copyright (c) 2005, 2008 David Grudl (http://davidgrudl.com)
+Good news! You may use Dibi under the terms of either the New BSD License
+or the GNU General Public License (GPL) version 2 or 3.
+
+The BSD License is recommended for most projects. It's easy to understand, and it
+places almost no restrictions on what you can do with the library. If the GPL
+fits better to your project, you can use the Dibi under this license.
+
+You don't have anyone to notify which license you are using. You can freely
+use Dibi in commercial projects as long as the copyright header
+remains intact.
+
+Please, do not use "Dibi" in the name of your project or top-level domain,
+and choose a name that stands on its own merits. If your stuff is good,
+it will not take long to establish a reputation for yourselves.
+
+
+
+New BSD License
+---------------
+
+Copyright (c) 2005, 2011 David Grudl (http://davidgrudl.com)
 All rights reserved.
 
-This license is a legal agreement between you and David Grudl (the "Author")
-for the use of "dibi" (the "Software"). By obtaining, using and/or
-copying the Software, you agree that you have read, understood, and will
-comply with the terms and conditions of this license.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
+	* Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
 
-PERMITTED USE
--------------
+	* 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.
 
-You are permitted to use, copy, modify, and distribute the Software and its
-documentation, with or without modification, for any purpose, provided that
-the following conditions are met:
+	* Neither the name of "Dibi" nor the names of its contributors
+	may be used to endorse or promote products derived from this software
+	without specific prior written permission.
 
-1. A copy of this license agreement must be included with the distribution.
-
-2. Redistributions of source code must retain the above copyright notice in
-   all source code files.
-
-3. Redistributions in binary form must reproduce the above copyright notice
-   in the documentation and/or other materials provided with the distribution.
-
-4. Products derived from the Software must include an acknowledgment that
-   they are derived from "dibi" in their documentation and/or other
-   materials provided with the distribution.
-
-5. The name "dibi" must not be used to endorse or promote products
-   derived from the Software without prior written permission from Author.
-
-6. Products derived from the Software may not be called "dibi",
-   nor may "dibi" appear in their name, without prior written
-   permission from Author.
-
-
-INDEMNITY
----------
-
-You agree to indemnify and hold harmless the Author and any contributors
-for any direct, indirect, incidental, or consequential third-party claims,
-actions or suits, as well as any related expenses, liabilities, damages,
-settlements or fees arising from your use or misuse of the Software,
-or a violation of any terms of this license.
-
-
-DISCLAIMER OF WARRANTY
-----------------------
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER BE LIABLE FOR
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+
+
+
+GNU General Public License
+--------------------------
+
+GPL licenses are very very long, so instead of the full text here are just some URL.
+
+- GPL version 2: http://www.gnu.org/licenses/gpl-2.0.html
+- GPL version 3: http://www.gnu.org/licenses/gpl-3.0.html
diff --git a/readme.txt b/readme.txt
index 2dd6cf9..9c4ab5f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,3 @@
-Dibi (c) David Grudl, 2005-2010 (http://davidgrudl.com)
-
-
-
 Introduction
 ------------
 
@@ -10,10 +6,6 @@ Thank you for downloading Dibi!
 Database access functions in PHP are not standardised. This is class library
 to hide the differences between the different databases access.
 
-The files in this archive are released under the Dibi license.
-See license.txt in this directory for a copy of the license.
-
-
 
 Documentation and Examples
 --------------------------
@@ -24,7 +16,6 @@ available on the homepage:
 http://dibiphp.com
 
 
-
 Dibi.minified
 -------------
 
@@ -35,7 +26,6 @@ This is exactly the same as normal version, just only comments and
 whitespaces are removed.
 
 
-
 -----
 For more information, visit the author's weblog (in czech language):
 http://phpfashion.com