diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index f584390b37..0276714c57 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -40,6 +40,73 @@ class PhpDocController extends Controller
      * @param string $root the directory to parse files from. Defaults to YII_PATH.
      */
     public function actionProperty($root = null)
+    {
+        $files = $this->findFiles($root);
+
+        $nFilesTotal = 0;
+        $nFilesUpdated = 0;
+        foreach ($files as $file) {
+            $result = $this->generateClassPropertyDocs($file);
+            if ($result !== false) {
+                list($className, $phpdoc) = $result;
+                if ($this->updateFiles) {
+                    if ($this->updateClassPropertyDocs($file, $className, $phpdoc)) {
+                        $nFilesUpdated++;
+                    }
+                } elseif (!empty($phpdoc)) {
+                    $this->stdout("\n[ " . $file . " ]\n\n", Console::BOLD);
+                    $this->stdout($phpdoc);
+                }
+            }
+            $nFilesTotal++;
+        }
+
+        $this->stdout("\nParsed $nFilesTotal files.\n");
+        $this->stdout("Updated $nFilesUpdated files.\n");
+    }
+
+    /**
+     * Fix some issues with PHPdoc in files
+     *
+     * @param string $root the directory to parse files from. Defaults to YII_PATH.
+     */
+    public function actionFix($root = null)
+    {
+        $files = $this->findFiles($root);
+
+        $nFilesTotal = 0;
+        $nFilesUpdated = 0;
+        foreach ($files as $file) {
+            $contents = file_get_contents($file);
+            $sha = sha1($contents);
+
+            // fix line endings
+            $lines = preg_split('/(\r\n|\n|\r)/', $contents);
+
+            $this->fixFileDoc($lines);
+
+            $newContent = implode("\n", $lines);
+            if ($sha !== sha1($newContent)) {
+                $nFilesUpdated++;
+            }
+            file_put_contents($file, $newContent);
+            $nFilesTotal++;
+        }
+
+        $this->stdout("\nParsed $nFilesTotal files.\n");
+        $this->stdout("Updated $nFilesUpdated files.\n");
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function options($actionId)
+    {
+        return array_merge(parent::options($actionId), ['updateFiles']);
+    }
+
+    protected function findFiles($root)
     {
         $except = [];
         if ($root === null) {
@@ -72,15 +139,15 @@ class PhpDocController extends Controller
         $root = FileHelper::normalizePath($root);
         $options = [
             'filter' => function ($path) {
-                if (is_file($path)) {
-                    $file = basename($path);
-                    if ($file[0] < 'A' || $file[0] > 'Z') {
-                        return false;
+                    if (is_file($path)) {
+                        $file = basename($path);
+                        if ($file[0] < 'A' || $file[0] > 'Z') {
+                            return false;
+                        }
                     }
-                }
 
-                return null;
-            },
+                    return null;
+                },
             'only' => ['*.php'],
             'except' => array_merge($except, [
                 'views/',
@@ -89,35 +156,42 @@ class PhpDocController extends Controller
                 'vendor/',
             ]),
         ];
-        $files = FileHelper::findFiles($root, $options);
-        $nFilesTotal = 0;
-        $nFilesUpdated = 0;
-        foreach ($files as $file) {
-            $result = $this->generateClassPropertyDocs($file);
-            if ($result !== false) {
-                list($className, $phpdoc) = $result;
-                if ($this->updateFiles) {
-                    if ($this->updateClassPropertyDocs($file, $className, $phpdoc)) {
-                        $nFilesUpdated++;
-                    }
-                } elseif (!empty($phpdoc)) {
-                    $this->stdout("\n[ " . $file . " ]\n\n", Console::BOLD);
-                    $this->stdout($phpdoc);
-                }
-            }
-            $nFilesTotal++;
-        }
-
-        $this->stdout("\nParsed $nFilesTotal files.\n");
-        $this->stdout("Updated $nFilesUpdated files.\n");
+        return FileHelper::findFiles($root, $options);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function options($actionId)
+    protected function fixFileDoc(&$lines)
     {
-        return array_merge(parent::options($actionId), ['updateFiles']);
+        // find namespace
+        $namespace = false;
+        $namespaceLine = '';
+        $contentAfterNamespace = false;
+        foreach($lines as $i => $line) {
+            if (substr(trim($line), 0, 9) === 'namespace') {
+                $namespace = $i;
+                $namespaceLine = trim($line);
+            } elseif ($namespace !== false && trim($line) !== '') {
+                $contentAfterNamespace = $i;
+                break;
+            }
+        }
+
+        if ($namespace !== false && $contentAfterNamespace !== false) {
+            while($contentAfterNamespace > 0) {
+                array_shift($lines);
+                $contentAfterNamespace--;
+            }
+            $lines = array_merge([
+                "<?php",
+                "/**",
+                " * @link http://www.yiiframework.com/",
+                " * @copyright Copyright (c) 2008 Yii Software LLC",
+                " * @license http://www.yiiframework.com/license/",
+                " */",
+                "",
+                $namespaceLine,
+                ""
+            ], $lines);
+        }
     }
 
     protected function updateClassPropertyDocs($file, $className, $propertyDoc)
diff --git a/extensions/apidoc/templates/bootstrap/ApiRenderer.php b/extensions/apidoc/templates/bootstrap/ApiRenderer.php
index e04f5f6d96..a24cbf2c18 100644
--- a/extensions/apidoc/templates/bootstrap/ApiRenderer.php
+++ b/extensions/apidoc/templates/bootstrap/ApiRenderer.php
@@ -6,6 +6,7 @@
  */
 
 namespace yii\apidoc\templates\bootstrap;
+
 use yii\apidoc\models\Context;
 use yii\console\Controller;
 use Yii;
diff --git a/extensions/apidoc/templates/bootstrap/GuideRenderer.php b/extensions/apidoc/templates/bootstrap/GuideRenderer.php
index e31ec4d081..2df637d593 100644
--- a/extensions/apidoc/templates/bootstrap/GuideRenderer.php
+++ b/extensions/apidoc/templates/bootstrap/GuideRenderer.php
@@ -6,6 +6,7 @@
  */
 
 namespace yii\apidoc\templates\bootstrap;
+
 use Yii;
 use yii\helpers\Html;
 
diff --git a/extensions/apidoc/templates/bootstrap/RendererTrait.php b/extensions/apidoc/templates/bootstrap/RendererTrait.php
index 376aa212ae..c7d654ba3b 100644
--- a/extensions/apidoc/templates/bootstrap/RendererTrait.php
+++ b/extensions/apidoc/templates/bootstrap/RendererTrait.php
@@ -1,6 +1,8 @@
 <?php
 /**
- * @author Carsten Brandt <mail@cebe.cc>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
  */
 
 namespace yii\apidoc\templates\bootstrap;
diff --git a/extensions/codeception/BasePage.php b/extensions/codeception/BasePage.php
index 32a12a38d7..521c412030 100644
--- a/extensions/codeception/BasePage.php
+++ b/extensions/codeception/BasePage.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\codeception;
 
diff --git a/extensions/debug/models/search/Mail.php b/extensions/debug/models/search/Mail.php
index 5afeb98a28..bf69b290c3 100644
--- a/extensions/debug/models/search/Mail.php
+++ b/extensions/debug/models/search/Mail.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\debug\models\search;
 
diff --git a/extensions/debug/panels/MailPanel.php b/extensions/debug/panels/MailPanel.php
index a074b9950f..f2314db0a9 100644
--- a/extensions/debug/panels/MailPanel.php
+++ b/extensions/debug/panels/MailPanel.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\debug\panels;
 
diff --git a/extensions/smarty/ViewRenderer.php b/extensions/smarty/ViewRenderer.php
index 0efec276ab..b54171c18d 100644
--- a/extensions/smarty/ViewRenderer.php
+++ b/extensions/smarty/ViewRenderer.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * Smarty view renderer class file.
- *
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/extensions/sphinx/IndexSchema.php b/extensions/sphinx/IndexSchema.php
index 073c1e7e5f..e0f902423b 100644
--- a/extensions/sphinx/IndexSchema.php
+++ b/extensions/sphinx/IndexSchema.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/extensions/twig/ViewRenderer.php b/extensions/twig/ViewRenderer.php
index 786d341282..79ad970946 100644
--- a/extensions/twig/ViewRenderer.php
+++ b/extensions/twig/ViewRenderer.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * Twig view renderer class file.
- *
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/extensions/twig/ViewRendererStaticClassProxy.php b/extensions/twig/ViewRendererStaticClassProxy.php
index e25b430f07..343417d7db 100644
--- a/extensions/twig/ViewRendererStaticClassProxy.php
+++ b/extensions/twig/ViewRendererStaticClassProxy.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * Twig ViewRendererStaticClassProxy class file.
- *
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/base/Action.php b/framework/base/Action.php
index ae7c2c3d3a..f5779a2638 100644
--- a/framework/base/Action.php
+++ b/framework/base/Action.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://www.yiiframework.com/
+ * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
- * @license   http://www.yiiframework.com/license/
+ * @license http://www.yiiframework.com/license/
  */
 
 namespace yii\base;
diff --git a/framework/console/Application.php b/framework/console/Application.php
index bcd93684b1..ddc25baf74 100644
--- a/framework/console/Application.php
+++ b/framework/console/Application.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Console Application class file.
- *
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php
index ff448c22ea..59235617a4 100644
--- a/framework/console/controllers/MessageController.php
+++ b/framework/console/controllers/MessageController.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php
index 48fc381e61..83221c7ac2 100644
--- a/framework/console/controllers/MigrateController.php
+++ b/framework/console/controllers/MigrateController.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
index f5cdfe2aaf..bc28f3c747 100644
--- a/framework/db/ActiveQuery.php
+++ b/framework/db/ActiveQuery.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 26c4a8acb4..ba0badf682 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/db/ActiveRecordInterface.php b/framework/db/ActiveRecordInterface.php
index 8418581da3..3a23a2adb0 100644
--- a/framework/db/ActiveRecordInterface.php
+++ b/framework/db/ActiveRecordInterface.php
@@ -1,8 +1,8 @@
 <?php
 /**
- *
- *
- * @author Carsten Brandt <mail@cebe.cc>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
  */
 
 namespace yii\db;
diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php
index e0410865de..965a40db02 100644
--- a/framework/db/BaseActiveRecord.php
+++ b/framework/db/BaseActiveRecord.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/db/Migration.php b/framework/db/Migration.php
index 87fcdde69a..b03957ba7a 100644
--- a/framework/db/Migration.php
+++ b/framework/db/Migration.php
@@ -6,6 +6,7 @@
  */
 
 namespace yii\db;
+
 use yii\di\Instance;
 
 /**
diff --git a/framework/db/TableSchema.php b/framework/db/TableSchema.php
index 48723a47db..7900561072 100644
--- a/framework/db/TableSchema.php
+++ b/framework/db/TableSchema.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/db/mssql/TableSchema.php b/framework/db/mssql/TableSchema.php
index 6c0d330342..05268ea31f 100644
--- a/framework/db/mssql/TableSchema.php
+++ b/framework/db/mssql/TableSchema.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php
index afb63bd9f0..fd67f2f488 100644
--- a/framework/db/pgsql/QueryBuilder.php
+++ b/framework/db/pgsql/QueryBuilder.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/framework/db/pgsql/Schema.php b/framework/db/pgsql/Schema.php
index 2e75e133a4..9cac0033e3 100644
--- a/framework/db/pgsql/Schema.php
+++ b/framework/db/pgsql/Schema.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/framework/helpers/ArrayHelper.php b/framework/helpers/ArrayHelper.php
index 9d428f52e8..480ad8d388 100644
--- a/framework/helpers/ArrayHelper.php
+++ b/framework/helpers/ArrayHelper.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/BaseArrayHelper.php b/framework/helpers/BaseArrayHelper.php
index 4172688300..ac156e87fd 100644
--- a/framework/helpers/BaseArrayHelper.php
+++ b/framework/helpers/BaseArrayHelper.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
index 29f05efe5a..b7fa166a1c 100644
--- a/framework/helpers/BaseFileHelper.php
+++ b/framework/helpers/BaseFileHelper.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Filesystem helper class file.
- *
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/helpers/BaseHtmlPurifier.php b/framework/helpers/BaseHtmlPurifier.php
index 8dd522e3c7..6f5b4509c8 100644
--- a/framework/helpers/BaseHtmlPurifier.php
+++ b/framework/helpers/BaseHtmlPurifier.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
+
 namespace yii\helpers;
 
 /**
diff --git a/framework/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php
index b5b8428586..e9555189b4 100644
--- a/framework/helpers/BaseInflector.php
+++ b/framework/helpers/BaseInflector.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/BaseMarkdown.php b/framework/helpers/BaseMarkdown.php
index 6d8ee39e92..44d829cf6a 100644
--- a/framework/helpers/BaseMarkdown.php
+++ b/framework/helpers/BaseMarkdown.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/BaseVarDumper.php b/framework/helpers/BaseVarDumper.php
index c9805960c2..24d54620d5 100644
--- a/framework/helpers/BaseVarDumper.php
+++ b/framework/helpers/BaseVarDumper.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/FileHelper.php b/framework/helpers/FileHelper.php
index 63954a423c..9fcf164ac4 100644
--- a/framework/helpers/FileHelper.php
+++ b/framework/helpers/FileHelper.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Filesystem helper class file.
- *
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/helpers/HtmlPurifier.php b/framework/helpers/HtmlPurifier.php
index f2852ad72a..d15d1178e6 100644
--- a/framework/helpers/HtmlPurifier.php
+++ b/framework/helpers/HtmlPurifier.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/Markdown.php b/framework/helpers/Markdown.php
index 88debe8522..baca38b085 100644
--- a/framework/helpers/Markdown.php
+++ b/framework/helpers/Markdown.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2008 Yii Software LLC
  * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/helpers/VarDumper.php b/framework/helpers/VarDumper.php
index 1ac5aa7afe..cb5d0f91d5 100644
--- a/framework/helpers/VarDumper.php
+++ b/framework/helpers/VarDumper.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
diff --git a/framework/validators/ImageValidator.php b/framework/validators/ImageValidator.php
index 89f087e1fa..3e1a3c9373 100644
--- a/framework/validators/ImageValidator.php
+++ b/framework/validators/ImageValidator.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Image validator class file.
- *
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index 8f2955dd45..cdfff47eeb 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
+
 namespace yii\widgets;
 
 use Yii;