diff --git a/jboss/plugin.jelly b/jboss/plugin.jelly
index a106685d..7d402c92 100644
--- a/jboss/plugin.jelly
+++ b/jboss/plugin.jelly
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <!--
   =============================================================================
     JBoss plugin for Maven. Contains JBoss related goals useful for
@@ -30,6 +30,7 @@
   xmlns:util="jelly:util"
   xmlns:jmx="jmx"
   xmlns:define="jelly:define"
+  xmlns:maven="jelly:maven"
   xmlns:artifact="artifact">
 
   <!--
@@ -330,12 +331,22 @@
    
   <goal name="jboss:deploy-warfile" prereqs="war:war"
     description="Invoke the 'war' goal and deploy the result"> 
-    <jmx:deploy jmx.deploy.file='${maven.build.dir}/${maven.war.final.name}'/>
+
+    <maven:get var="warBuildDir" plugin="maven-war-plugin" property="maven.war.build.dir"/>
+    <maven:get var="warFinalName" plugin="maven-war-plugin" property="maven.war.final.name"/>
+
+    <jmx:deploy jmx.deploy.file='${warBuildDir}/${warFinalName}'/>
+
   </goal>
   
-  <goal name="jboss:undeploy-warfile" prereqs="war:init"
+  <goal name="jboss:undeploy-warfile"
     description="Undeploy the result of the 'war' goal">
-    <jmx:undeploy jmx.deploy.file='${maven.build.dir}/${maven.war.final.name}'/>
+
+    <maven:get var="warBuildDir" plugin="maven-war-plugin" property="maven.war.build.dir"/>
+    <maven:get var="warFinalName" plugin="maven-war-plugin" property="maven.war.final.name"/>
+    
+    <jmx:undeploy jmx.deploy.file='${warBuildDir}/${warFinalName}'/>
+    
   </goal>
    
   <!-- Once maven has a goal that will build a jarfile of EJBs, this should
diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml
index 460bb332..836314d0 100644
--- a/jboss/xdocs/changes.xml
+++ b/jboss/xdocs/changes.xml
@@ -25,6 +25,12 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="fix">
+        Removed dependency on non-public goal <code>war:init</code> and migrated the
+        <code>jboss:deploy-warfile</code> and <code>jboss:undeploy-warfile</code>
+        goals to use the new <code>maven:get</code> tag to retrieve properties
+        from the WAR plugin.
+      </action>
       <action dev="vmassol" type="add" issue="MPJBOSS-14" due-to="Marc-Antoine Guarrigue">
         Added new debug scripts that add the <code>-Xdebug</code> and other debugging 
         options to enable remote debugging of a JBoss server.
