diff --git a/appserver/plugin.jelly b/appserver/plugin.jelly
index b0771a3b..e0d5a80f 100644
--- a/appserver/plugin.jelly
+++ b/appserver/plugin.jelly
@@ -32,7 +32,7 @@
   <!--==================================================================-->
   <j:import inherit="true" file="${plugin.resources}/tomcat-4.0.x.jelly" />
   <j:import inherit="true" file="${plugin.resources}/tomcat-4.1.x.jelly" />
-  <j:import inherit="true" file="${plugin.resources}/orion-2.0.2.jelly" />
+  <j:import inherit="true" file="${plugin.resources}/orion-2.0.x.jelly" />
 
   <!--==================================================================-->
   <!-- B E G I N  C O R E  P R O C E S S I N G                          -->
@@ -141,7 +141,7 @@
       </j:when>
       <j:when test="${context.getVariable('maven.appserver.name') == 'orion'}">
         <j:choose>
-          <j:when test="${context.getVariable('maven.appserver.version') == '2.0.2'}" />
+          <j:when test="${context.getVariable('maven.appserver.version') == '2.0.x'}" />
           <j:otherwise>
             <exception:appserverVersionNotSupported
               appserver="${maven.appserver.name}"
@@ -621,4 +621,4 @@ Appserver already cleaned!
     </j:choose>
   </goal>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/appserver/src/plugin-resources/orion-2.0.2.jelly b/appserver/src/plugin-resources/orion-2.0.x.jelly
similarity index 91%
rename from appserver/src/plugin-resources/orion-2.0.2.jelly
rename to appserver/src/plugin-resources/orion-2.0.x.jelly
index 821adfef..1b353470 100644
--- a/appserver/src/plugin-resources/orion-2.0.2.jelly
+++ b/appserver/src/plugin-resources/orion-2.0.x.jelly
@@ -4,7 +4,7 @@
   xmlns:orion202="http://www.maven.org/plugin/appserver/orion202"
   xmlns:define="jelly:define" >
 
-  <goal name="appserver:orion-2.0.2-reqs"
+  <goal name="appserver:orion-2.0.x-reqs"
     description="Intialize resources for tomcat processing">
 
     <!-- Check if user has http.conf in a conf dir -->
@@ -128,24 +128,24 @@ ${maven.appserver.conf.dir}/lib/hsqldb.jar
   <!--==================================================================-->
   <!-- R E I N S T A L L                                                -->
   <!--==================================================================-->
-  <goal name="appserver:reinstall-orion-2.0.2"
-    prereqs="appserver:orion-2.0.2-reqs" description="Reinstall orion 2.0.2">
+  <goal name="appserver:reinstall-orion-2.0.x"
+    prereqs="appserver:orion-2.0.x-reqs" description="Reinstall orion 2.0.x">
     <orion202:install force="true"/>
   </goal>
 
   <!--==================================================================-->
   <!-- I N S T A L L                                                    -->
   <!--==================================================================-->
-  <goal name="appserver:install-orion-2.0.2" prereqs="appserver:orion-2.0.2-reqs"
-    description="Install orion 2.0.2">
+  <goal name="appserver:install-orion-2.0.x" prereqs="appserver:orion-2.0.x-reqs"
+    description="Install orion 2.0.x">
     <orion202:install force="false"/>
   </goal>
 
   <!--==================================================================-->
   <!-- S T A R T                                                        -->
   <!--==================================================================-->
-  <goal name="appserver:start-orion-2.0.2" prereqs="appserver:orion-2.0.2-reqs"
-    description="Start orion 2.0.2" >
+  <goal name="appserver:start-orion-2.0.x" prereqs="appserver:orion-2.0.x-reqs"
+    description="Start orion 2.0.x" >
     <java jar="${maven.appserver.home}/orion.jar" fork="yes"
         dir="${maven.appserver.dir}">
         <classpath>
@@ -161,8 +161,8 @@ ${maven.appserver.conf.dir}/lib/hsqldb.jar
   <!--==================================================================-->
   <!-- R E S T A R T                                                    -->
   <!--==================================================================-->
-  <goal name="appserver:restart-orion-2.0.2" description="Restart orion 2.0.2"
-    prereqs="appserver:orion-2.0.2-reqs" >
+  <goal name="appserver:restart-orion-2.0.x" description="Restart orion 2.0.x"
+    prereqs="appserver:orion-2.0.x-reqs" >
     <java jar="${maven.appserver.home}/admin.jar" fork="yes"
     		dir="${maven.appserver.dir}">
       <arg value="ormi://${maven.appserver.host}:${maven.appserver.rmi.port}" />
@@ -180,8 +180,8 @@ ${maven.appserver.conf.dir}/lib/hsqldb.jar
   <!--==================================================================-->
   <!-- S T O P                                                          -->
   <!--==================================================================-->
-  <goal name="appserver:stop-orion-2.0.2" description="Stop orion 2.0.2"
-    prereqs="appserver:orion-2.0.2-reqs" >
+  <goal name="appserver:stop-orion-2.0.x" description="Stop orion 2.0.x"
+    prereqs="appserver:orion-2.0.x-reqs" >
 
     <java jar="${maven.appserver.home}/admin.jar" fork="yes"
     		dir="${maven.appserver.dir}">
@@ -200,8 +200,8 @@ ${maven.appserver.conf.dir}/lib/hsqldb.jar
   <!--==================================================================-->
   <!-- C L E A N                                                        -->
   <!--==================================================================-->
-  <goal name="appserver:clean-orion-2.0.2" description="Clean orion 2.0.2"
-    prereqs="appserver:orion-2.0.2-reqs" >
+  <goal name="appserver:clean-orion-2.0.x" description="Clean orion 2.0.x"
+    prereqs="appserver:orion-2.0.x-reqs" >
 	<ant:delete dir="${maven.appserver.dir}"/>
 	<ant:mkdir dir="${maven.appserver.dir}"/>
   </goal>
diff --git a/appserver/xdocs/appserver.xml b/appserver/xdocs/appserver.xml
index 3c3a11bf..d0bc2685 100644
--- a/appserver/xdocs/appserver.xml
+++ b/appserver/xdocs/appserver.xml
@@ -72,9 +72,9 @@
         <td><code>12</code> or <code>13</code></td>
       </tr>
       <tr>
-        <td><a href="http://www.orionserver.com">Orion 2.0.2</a></td>
+        <td><a href="http://www.orionserver.com">Orion 2.0.x</a></td>
         <td><code>orion</code></td>
-        <td><code>2.0.2</code></td>
+        <td><code>2.0.x</code></td>
       </tr>
     </table>