diff --git a/site/plugin.jelly b/site/plugin.jelly
index f863869c..7bb73110 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -124,6 +124,17 @@
     description="Deploy the generated site docs using ftp">
 
     <!-- FTP to the server -->
+    <taskdef
+      name="ftp"
+      classname="org.apache.tools.ant.taskdefs.optional.net.FTP"
+    >
+      <classpath>
+        <pathelement path="${plugin.getDependencyPath('ant')}"/>
+        <pathelement path="${plugin.getDependencyPath('ant-commons-net')}"/>
+        <pathelement path="${plugin.getDependencyPath('commons-net')}"/>
+        <pathelement path="${plugin.getDependencyPath('oro')}"/>
+      </classpath>
+    </taskdef>
     <ftp server="${siteAddress}"
     	 userid="${siteUsername}"
     	 password="${maven.password}"
diff --git a/site/project.xml b/site/project.xml
index 76d65af5..bd829cc8 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
@@ -72,6 +70,15 @@
         <role>Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>  
   </developers>
   <dependencies>
     <dependency>
@@ -79,10 +86,29 @@
       <artifactId>commons-lang</artifactId>
       <version>2.0</version>
     </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant-commons-net</artifactId>
+      <version>1.6.4</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
+    </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>1.1.0</version>
+      <version>1.4.0</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
   </dependencies>
   <versions>
diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml
index 71c4ad04..23737fe9 100644
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <document>
   <properties>
     <title>Changes</title>
@@ -25,6 +23,7 @@
   </properties>
   <body>
     <release version="1.6.1-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="fix" issue="MPSITE-22">Goal site:ftpdeploy does nothing</action>
       <action dev="brett" type="fix">In SSH mode do not continue with other commands if any prior commands have failed</action>
       <action dev="brett" type="fix" issue="MPSITE-23" due-to="Oscar Picasso">Corrected rsync behaviour in some environments</action>
       <action dev="brett" type="change">Remove -v option from rsync by default</action>
