diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index b2abee92b..9ed0cc408 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -19,6 +19,26 @@
     'method_argument_space' => array(
         'on_multiline' => 'ensure_fully_multiline',
     ),
+    'general_phpdoc_annotation_remove' => array(
+        'annotations' => array('version', 'license', 'since'),
+    ),
+    'phpdoc_no_package' => true,
+    'phpdoc_separation' => array(
+        'groups' => array(
+            array(
+                'author',
+            ),
+            array(
+                'deprecated',
+                'see',
+            ),
+            array(
+                'param',
+                'return',
+                'throws',
+            ),
+        ),
+    ),
 ))
     ->setCacheFile('.php-cs-fixer.cache')
     ->setFinder($finder)