diff --git a/dist/project.xml b/dist/project.xml
index 9cd9c51e..a3ba88dc 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-dist-plugin</id>
   <name>Maven Distribution Plugin</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.7-SNAPSHOT</currentVersion>
   <shortDescription>Create source and binary distributions</shortDescription>
   <url>http://maven.apache.org/reference/plugins/dist/</url>
   <issueTrackingUrl>http://jira.codehaus.org/browse/MPDIST</issueTrackingUrl>
diff --git a/dist/src/plugin-test/maven.xml b/dist/src/plugin-test/maven.xml
index a4216148..070d01d7 100644
--- a/dist/src/plugin-test/maven.xml
+++ b/dist/src/plugin-test/maven.xml
@@ -15,27 +15,18 @@
  * limitations under the License.
  */
  -->
-<project xmlns:util="jelly:util"
-         xmlns:dist="dist"
+<project xmlns:assert="assert"
+         xmlns:util="jelly:util"
          xmlns:j="jelly:core">
          
   <goal name="testPlugin" prereqs="test-dist">
   </goal>
   
   <goal name="test-dist">
-<!--
-    <echo>dist dir is ${maven.dist.dir}</echo>
     <attainGoal name="dist"/>
     <util:tokenize var="files" delim=",">-src.tar.gz,-src.zip,.tar.gz,.zip</util:tokenize>
     <j:forEach var="file" items="${files}">
--->
-      <!-- NOTE: maven.dist.dir doesn't work here??? -->
-<!--      <j:set var="expectedFile" value="${maven.build.dir}/distributions/test-maven-dist-plugin-1.0-SNAPSHOT${file}"/>
-      <util:file var="file" name="${expectedFile}" />
-      <j:if test="${!(file.exists())}">
-        <fail>${expectedFile} not generated</fail>
-      </j:if>
+      <assert:assertFileExists file="${maven.dist.dir}/test-maven-dist-plugin-1.0-SNAPSHOT${file}"/>
     </j:forEach>
--->
   </goal>
 </project>
\ No newline at end of file
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index aabc2854..4616993e 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="vmassol@octo.com">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.7" date="in CVS">
+      <action dev="dion" type="update">Reinstate plugin tests</action>
+    </release>
     <release version="1.6" date="2004-06-25">
       <action dev="brett" type="update">Use artifact plugin for deployments</action>
     </release>