diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index ebb2863..2d33617 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -44,6 +44,17 @@
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <!-- misc -->
     <dependency>
       <groupId>bsh</groupId>
@@ -52,4 +63,13 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java b/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
index 959930f..e7ef14a 100644
--- a/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
+++ b/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
@@ -35,6 +35,8 @@ import org.apache.maven.tools.plugin.extractor.ExtractionException;
 
 import bsh.EvalError;
 import bsh.Interpreter;
+import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * Extracts Mojo descriptors from <a href="http://www.beanshell.org/">BeanShell</a> sources.
@@ -45,8 +47,10 @@ import bsh.Interpreter;
  * get validation directives to help users in IDEs.
  * @version $Id$
  */
+@Component( role = MojoDescriptorExtractor.class, hint = "bsh")
 public class BeanshellMojoDescriptorExtractor
     extends AbstractScriptedMojoDescriptorExtractor
+    implements MojoDescriptorExtractor
 {
     /** {@inheritDoc} */
     protected String getScriptFileExtension( PluginToolsRequest request )
diff --git a/maven-plugin-tools-beanshell/src/main/resources/META-INF/plexus/components.xml b/maven-plugin-tools-beanshell/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index e93baca..0000000
--- a/maven-plugin-tools-beanshell/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<component-set>
-  <components>
-
-    <!--
-     |
-     | BeanshellMojoDescriptorExtractor, a MojoDescriptor extractor to read
-     | descriptors from java sources.
-     |
-     -->
-    <component>
-      <role>org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor</role>
-      <role-hint>bsh</role-hint>
-      <implementation>org.apache.maven.tools.plugin.extractor.beanshell.BeanshellMojoDescriptorExtractor
-      </implementation>
-    </component>
-
-  </components>
-</component-set>
\ No newline at end of file