diff --git a/Command/BuildCommand.php b/Command/BuildCommand.php
index ef3adae..79c0c13 100644
--- a/Command/BuildCommand.php
+++ b/Command/BuildCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/BuildModelCommand.php b/Command/BuildModelCommand.php
index 03b1402..96e1384 100644
--- a/Command/BuildModelCommand.php
+++ b/Command/BuildModelCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/BuildSqlCommand.php b/Command/BuildSqlCommand.php
index dc9aafc..2a22a92 100644
--- a/Command/BuildSqlCommand.php
+++ b/Command/BuildSqlCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/DataDumpCommand.php b/Command/DataDumpCommand.php
index 9275425..9dae1fa 100644
--- a/Command/DataDumpCommand.php
+++ b/Command/DataDumpCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/DataSqlCommand.php b/Command/DataSqlCommand.php
index d1e76ad..fbc73c0 100644
--- a/Command/DataSqlCommand.php
+++ b/Command/DataSqlCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/DatabaseCreateCommand.php b/Command/DatabaseCreateCommand.php
index cba16f8..56d9173 100644
--- a/Command/DatabaseCreateCommand.php
+++ b/Command/DatabaseCreateCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/DatabaseDropCommand.php b/Command/DatabaseDropCommand.php
index 1d0ce40..2776986 100644
--- a/Command/DatabaseDropCommand.php
+++ b/Command/DatabaseDropCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/GraphvizCommand.php b/Command/GraphvizCommand.php
index 50848c5..dfae85d 100644
--- a/Command/GraphvizCommand.php
+++ b/Command/GraphvizCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/InsertSqlCommand.php b/Command/InsertSqlCommand.php
index 161798e..6d4ee6e 100644
--- a/Command/InsertSqlCommand.php
+++ b/Command/InsertSqlCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/LoadFixturesCommand.php b/Command/LoadFixturesCommand.php
index f6c8bc9..5ef3019 100644
--- a/Command/LoadFixturesCommand.php
+++ b/Command/LoadFixturesCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/MigrationGenerateDiffCommand.php b/Command/MigrationGenerateDiffCommand.php
index 6253285..b794048 100644
--- a/Command/MigrationGenerateDiffCommand.php
+++ b/Command/MigrationGenerateDiffCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/MigrationMigrateCommand.php b/Command/MigrationMigrateCommand.php
index 0f0ea1e..61abc55 100644
--- a/Command/MigrationMigrateCommand.php
+++ b/Command/MigrationMigrateCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/MigrationStatusCommand.php b/Command/MigrationStatusCommand.php
index e3009fd..39114eb 100644
--- a/Command/MigrationStatusCommand.php
+++ b/Command/MigrationStatusCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/Phing.php b/Command/Phing.php
index 4dd1c74..a3a6c1c 100644
--- a/Command/Phing.php
+++ b/Command/Phing.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 require_once 'phing/Phing.php';
diff --git a/Command/PhingCommand.php b/Command/PhingCommand.php
index f85aa74..ed42543 100644
--- a/Command/PhingCommand.php
+++ b/Command/PhingCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
diff --git a/Command/ReverseCommand.php b/Command/ReverseCommand.php
index 25cf657..2f267bf 100644
--- a/Command/ReverseCommand.php
+++ b/Command/ReverseCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Command/TableDropCommand.php b/Command/TableDropCommand.php
index 0de860a..ff2230a 100644
--- a/Command/TableDropCommand.php
+++ b/Command/TableDropCommand.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\PhingCommand;
diff --git a/Controller/PanelController.php b/Controller/PanelController.php
index 4fbcdce..45e6b2c 100644
--- a/Controller/PanelController.php
+++ b/Controller/PanelController.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Controller;
 
 use Symfony\Component\DependencyInjection\ContainerAware;
diff --git a/DataCollector/PropelDataCollector.php b/DataCollector/PropelDataCollector.php
index 7cf50ce..37f09cb 100644
--- a/DataCollector/PropelDataCollector.php
+++ b/DataCollector/PropelDataCollector.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\DataCollector;
 
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
diff --git a/DataCollector/Query.php b/DataCollector/Query.php
index 1986cff..78d40e9 100644
--- a/DataCollector/Query.php
+++ b/DataCollector/Query.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\DataCollector;
 
 /**
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index e4811b6..f28c778 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
diff --git a/DependencyInjection/PropelExtension.php b/DependencyInjection/PropelExtension.php
index 83b1025..80f588c 100644
--- a/DependencyInjection/PropelExtension.php
+++ b/DependencyInjection/PropelExtension.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\DependencyInjection;
 
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
diff --git a/DependencyInjection/Properties.php b/DependencyInjection/Properties.php
index db394bc..84acabe 100644
--- a/DependencyInjection/Properties.php
+++ b/DependencyInjection/Properties.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\DependencyInjection;
 
 /**
diff --git a/Form/ChoiceList/ModelChoiceList.php b/Form/ChoiceList/ModelChoiceList.php
index 32ab932..1c96c53 100644
--- a/Form/ChoiceList/ModelChoiceList.php
+++ b/Form/ChoiceList/ModelChoiceList.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Form\ChoiceList;
 
 use Symfony\Component\Form\Util\PropertyPath;
diff --git a/Form/DataTransformer/ModelToIdTransformer.php b/Form/DataTransformer/ModelToIdTransformer.php
index f05ddce..c69bd2a 100644
--- a/Form/DataTransformer/ModelToIdTransformer.php
+++ b/Form/DataTransformer/ModelToIdTransformer.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Form\DataTransformer;
 
 use Propel\PropelBundle\Form\ChoiceList\ModelChoiceList;
diff --git a/Form/DataTransformer/ModelsToArrayTransformer.php b/Form/DataTransformer/ModelsToArrayTransformer.php
index 99bca38..3e3f113 100644
--- a/Form/DataTransformer/ModelsToArrayTransformer.php
+++ b/Form/DataTransformer/ModelsToArrayTransformer.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Form\DataTransformer;
 
 use Symfony\Component\Form\DataTransformerInterface;
diff --git a/Form/EventListener/MergeCollectionListener.php b/Form/EventListener/MergeCollectionListener.php
index 375e84f..22ca401 100644
--- a/Form/EventListener/MergeCollectionListener.php
+++ b/Form/EventListener/MergeCollectionListener.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Form\EventListener;
 
 use Symfony\Component\Form\FormEvents;
diff --git a/Form/Type/ModelType.php b/Form/Type/ModelType.php
index ce10775..6ec4c0c 100644
--- a/Form/Type/ModelType.php
+++ b/Form/Type/ModelType.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Form\Type;
 
 use Symfony\Component\Form\FormBuilder;
diff --git a/Logger/PropelLogger.php b/Logger/PropelLogger.php
index 9f63100..10745b1 100644
--- a/Logger/PropelLogger.php
+++ b/Logger/PropelLogger.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Logger;
 
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
diff --git a/PropelBundle.php b/PropelBundle.php
index b848b7d..ff9d022 100644
--- a/PropelBundle.php
+++ b/PropelBundle.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/Resources/meta/LICENSE b/Resources/meta/LICENSE
index 51907f0..a55eeb3 100644
--- a/Resources/meta/LICENSE
+++ b/Resources/meta/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2011 william.durand1@gmail.com
+Copyright (c) 2010-2011 William Durand <william.durand1@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Tests/DependencyInjection/PropelExtensionTest.php b/Tests/DependencyInjection/PropelExtensionTest.php
index 1f02e7a..b447496 100644
--- a/Tests/DependencyInjection/PropelExtensionTest.php
+++ b/Tests/DependencyInjection/PropelExtensionTest.php
@@ -1,12 +1,11 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
+/**
+ * This file is part of the PropelBundle package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * @license    MIT License
  */
 
 namespace Propel\PropelBundle\Tests\DependencyInjection;
diff --git a/Tests/TestCase.php b/Tests/TestCase.php
index 1b3a794..166110e 100644
--- a/Tests/TestCase.php
+++ b/Tests/TestCase.php
@@ -1,12 +1,11 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
+/**
+ * This file is part of the PropelBundle package.
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * @license    MIT License
  */
 
 namespace Propel\PropelBundle\Tests;
@@ -17,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 /**
  * TestCase
  *
- * @author William DURAND <william.durand1@gmail.com>  
+ * @author William DURAND <william.durand1@gmail.com>
  */
 class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/Twig/Extension/SyntaxExtension.php b/Twig/Extension/SyntaxExtension.php
index 79bce69..193bf1a 100644
--- a/Twig/Extension/SyntaxExtension.php
+++ b/Twig/Extension/SyntaxExtension.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Twig\Extension;
 
 /**