diff --git a/ext/client-proxy-android/pom.xml b/ext/client-proxy-android/pom.xml
index dc484ae06..b8c8027e4 100644
--- a/ext/client-proxy-android/pom.xml
+++ b/ext/client-proxy-android/pom.xml
@@ -66,7 +66,7 @@
                 <include>org.apache.commons:commons-lang3</include>
                 <include>org.slf4j:slf4j-api</include>
                 <include>commons-io:commons-io</include>
-                <include>commons-beanutils:commons-beanutils-core</include>
+                <include>commons-beanutils:commons-beanutils</include>
                 <include>org.apache.httpcomponents:httpclient</include>
                 <include>org.apache.httpcomponents:httpcore</include>
                 <include>commons-logging:commons-logging</include>
diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml
index 827e7e9b1..bda3379d4 100644
--- a/ext/client-proxy/pom.xml
+++ b/ext/client-proxy/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils-core</artifactId>
+      <artifactId>commons-beanutils</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 0047b4d30..0f4af7c2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
     <commons.codec.version>1.9</commons.codec.version>
     <commons.io.version>2.4</commons.io.version>
     <commons.lang3.version>3.3.2</commons.lang3.version>
-    <commons.beanutils.version>1.8.3</commons.beanutils.version>
+    <commons.beanutils.version>1.9.1</commons.beanutils.version>
 
     <commons.logging.version>1.1.3</commons.logging.version>
     <commons.vfs.version>2.0</commons.vfs.version>
@@ -124,7 +124,7 @@
       </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils-core</artifactId>
+        <artifactId>commons-beanutils</artifactId>
         <version>${commons.beanutils.version}</version>
       </dependency>
 
@@ -363,6 +363,12 @@
           <artifactId>maven-invoker-plugin</artifactId>
           <version>1.8</version>
         </plugin>
+        
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9.1</version>
+        </plugin>        
       </plugins>
     </pluginManagement>
 
@@ -457,4 +463,37 @@
       </plugin>
     </plugins>
   </build>
+  
+  <profiles>
+    <profile>
+      <id>javadocs</id>
+      
+      <build>
+        <defaultGoal>javadoc:aggregate</defaultGoal>
+        
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <inherited>true</inherited>
+            <configuration>
+              <destDir>javadocs</destDir>
+              <detectLinks>true</detectLinks>
+              <detectJavaApiLink>true</detectJavaApiLink>
+              <links>
+                <link>http://docs.oracle.com/javaee/6/api/</link>
+                <link>http://www.slf4j.org/api/</link>
+                <link>http://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
+                <link>http://commons.apache.org/proper/commons-io/javadocs/api-release/</link>
+                <link>http://commons.apache.org/proper/commons-beanutils/javadocs/v1.9.1/apidocs/</link>
+                <link>http://commons.apache.org/proper/commons-codec/archives/1.9/apidocs/</link>
+                <link>http://www.viste.com/Java/Language/http-client/httpcomponents-client-4.2.3-bin/httpcomponents-client-4.2.3/javadoc/</link>
+                <link>http://fasterxml.github.io/jackson-databind/javadoc/2.3.0/</link>
+              </links>
+            </configuration>
+          </plugin>          
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>