diff --git a/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml b/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
index 5f76ab0..a184f45 100644
--- a/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
@@ -90,10 +90,6 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <version>@project.version@</version>
-        <configuration>
-          <!-- ignore MNG-6109 issue, always use plugin.xml since there are no sources in this IT -->
-          <usePluginXmlMavenVersionRange>[2.0,)</usePluginXmlMavenVersionRange>
-        </configuration>
       </plugin>
     </plugins>
   </reporting>
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
index 0ebe92d..0974302 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.plugin.descriptor;
  */
 
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -50,10 +51,10 @@ public class MNG6109PluginDescriptorBuilder extends PluginDescriptorBuilder
         for ( PlexusConfiguration d : parameterConfigurations )
         {
             String parameterName = d.getChild( "name" ).getValue();
+            Parameter pd = (Parameter) mojoDescriptor.getParameterMap().get( parameterName );
             
             String parameterSince = d.getChild( "since" ).getValue();
-            
-            mojoDescriptor.getParameterMap().get( parameterName ).setSince( parameterSince );
+            pd.setSince( parameterSince );
         }
         
         return mojoDescriptor;