diff --git a/CategoryTree.alias.php b/CategoryTree.alias.php
index e686d5b5..5a53c209 100644
--- a/CategoryTree.alias.php
+++ b/CategoryTree.alias.php
@@ -2,7 +2,8 @@
 /**
  * Aliases for Special:CategoryTree
  *
- * @addtogroup Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006-2008 Daniel Kinzler and others
  * @license GNU General Public Licence 2.0 or later
diff --git a/CategoryTree.css b/CategoryTree.css
index a338f639..200df9a1 100644
--- a/CategoryTree.css
+++ b/CategoryTree.css
@@ -2,8 +2,8 @@
  * Stylesheet for the CategoryTree extension, an AJAX based gadget
  * to display the category structure of a wiki
  *
- * @package MediaWiki
- * @subpackage Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006 Daniel Kinzler
  * @licence GNU General Public Licence 2.0 or later
diff --git a/CategoryTree.i18n.magic.php b/CategoryTree.i18n.magic.php
index cfb40ea6..e98f06f4 100644
--- a/CategoryTree.i18n.magic.php
+++ b/CategoryTree.i18n.magic.php
@@ -2,7 +2,8 @@
 /**
  * Internationalisation file for extension CategoryTree.
  *
- * @addtogroup Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006-2008 Daniel Kinzler
  * @license GNU General Public Licence 2.0 or later
diff --git a/CategoryTree.i18n.php b/CategoryTree.i18n.php
index 2b1c0704..5d4ee1bf 100644
--- a/CategoryTree.i18n.php
+++ b/CategoryTree.i18n.php
@@ -2,7 +2,8 @@
 /**
  * Internationalisation file for extension CategoryTree.
  *
- * @addtogroup Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006-2008 Daniel Kinzler
  * @license GNU General Public Licence 2.0 or later
diff --git a/CategoryTree.js b/CategoryTree.js
index f2973e58..77078fc0 100644
--- a/CategoryTree.js
+++ b/CategoryTree.js
@@ -2,8 +2,8 @@
  * JavaScript functions for the CategoryTree extension, an AJAX based gadget
  * to display the category structure of a wiki
  *
- * @package MediaWiki
- * @subpackage Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006 Daniel Kinzler
  * @licence GNU General Public Licence 2.0 or later
diff --git a/CategoryTree.php b/CategoryTree.php
index 323ad944..b3575583 100644
--- a/CategoryTree.php
+++ b/CategoryTree.php
@@ -3,7 +3,8 @@
  * Setup and Hooks for the CategoryTree extension, an AJAX based gadget
  * to display the category structure of a wiki
  *
- * @addtogroup Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006-2008 Daniel Kinzler and others
  * @license GNU General Public Licence 2.0 or later
diff --git a/CategoryTreeFunctions.php b/CategoryTreeFunctions.php
index 1fc0f8f9..87e06ef5 100644
--- a/CategoryTreeFunctions.php
+++ b/CategoryTreeFunctions.php
@@ -3,7 +3,8 @@
  * Core functions for the CategoryTree extension, an AJAX based gadget
  * to display the category structure of a wiki
  *
- * @addtogroup Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006-2007 Daniel Kinzler
  * @license GNU General Public Licence 2.0 or later
diff --git a/CategoryTreePage.php b/CategoryTreePage.php
index 0a0f9742..12c7f9d9 100644
--- a/CategoryTreePage.php
+++ b/CategoryTreePage.php
@@ -3,7 +3,8 @@
  * Special page for the  CategoryTree extension, an AJAX based gadget
  * to display the category structure of a wiki
  *
- * @addtogroup Extensions
+ * @file
+ * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
  * @copyright © 2006 Daniel Kinzler
  * @license GNU General Public Licence 2.0 or later