diff --git a/.classpath b/.classpath
index 0dd721534..3d14a80c5 100644
--- a/.classpath
+++ b/.classpath
@@ -93,13 +93,13 @@
 	<classpathentry kind="lib" path="lib/jsoup-1.8.3.jar"/>
 	<classpathentry kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/weupnp-0.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/common-image-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/common-io-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/common-lang-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/imageio-core-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/imageio-metadata-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/imageio-tiff-3.2.jar"/>
-	<classpathentry kind="lib" path="lib/imageio-bmp-3.2.jar"/>
+	<classpathentry kind="lib" path="lib/common-image-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/common-io-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/common-lang-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/imageio-core-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/imageio-metadata-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/imageio-tiff-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/imageio-bmp-3.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/jsonic-1.2.0.jar"/>
 	<classpathentry kind="lib" path="lib/langdetect.jar"/>
 	<classpathentry kind="output" path="gen"/>
diff --git a/build.xml b/build.xml
index 95cc602ac..43548fd9a 100644
--- a/build.xml
+++ b/build.xml
@@ -165,9 +165,9 @@
     	<pathelement location="${lib}/bcmail-jdk15-1.46.jar" />
     	<pathelement location="${lib}/bcprov-jdk15-1.46.jar" />
     	<pathelement location="${lib}/chardet.jar" />
-    	<pathelement location="${lib}/common-image-3.2.jar" />
-    	<pathelement location="${lib}/common-io-3.2.jar" />
-    	<pathelement location="${lib}/common-lang-3.2.jar" />
+    	<pathelement location="${lib}/common-image-3.2.1.jar" />
+    	<pathelement location="${lib}/common-io-3.2.1.jar" />
+    	<pathelement location="${lib}/common-lang-3.2.1.jar" />
     	<pathelement location="${lib}/commons-codec-1.10.jar" />
     	<pathelement location="${lib}/commons-compress-1.10.jar" />
     	<pathelement location="${lib}/commons-fileupload-1.3.1.jar" />
@@ -182,10 +182,10 @@
         <pathelement location="${lib}/httpcore-4.4.4.jar" />
         <pathelement location="${lib}/httpmime-4.5.1.jar" />
         <pathelement location="${lib}/icu4j-56_1.jar" />
-    	<pathelement location="${lib}/imageio-bmp-3.2.jar" />
-    	<pathelement location="${lib}/imageio-core-3.2.jar" />
-    	<pathelement location="${lib}/imageio-metadata-3.2.jar" />
-    	<pathelement location="${lib}/imageio-tiff-3.2.jar" />
+    	<pathelement location="${lib}/imageio-bmp-3.2.1.jar" />
+    	<pathelement location="${lib}/imageio-core-3.2.1.jar" />
+    	<pathelement location="${lib}/imageio-metadata-3.2.1.jar" />
+    	<pathelement location="${lib}/imageio-tiff-3.2.1.jar" />
         <pathelement location="${lib}/J7Zip-modified.jar" />
         <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
     	<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
diff --git a/lib/common-image-3.2.jar b/lib/common-image-3.2.1.jar
similarity index 79%
rename from lib/common-image-3.2.jar
rename to lib/common-image-3.2.1.jar
index 385c55bd5..63f9e8d8a 100644
Binary files a/lib/common-image-3.2.jar and b/lib/common-image-3.2.1.jar differ
diff --git a/lib/common-io-3.2.jar b/lib/common-io-3.2.1.jar
similarity index 86%
rename from lib/common-io-3.2.jar
rename to lib/common-io-3.2.1.jar
index 950515aed..5c30bbf89 100644
Binary files a/lib/common-io-3.2.jar and b/lib/common-io-3.2.1.jar differ
diff --git a/lib/common-lang-3.2.jar b/lib/common-lang-3.2.1.jar
similarity index 87%
rename from lib/common-lang-3.2.jar
rename to lib/common-lang-3.2.1.jar
index a0f9503bb..76ff63170 100644
Binary files a/lib/common-lang-3.2.jar and b/lib/common-lang-3.2.1.jar differ
diff --git a/lib/imageio-bmp-3.2.jar b/lib/imageio-bmp-3.2.1.jar
old mode 100755
new mode 100644
similarity index 85%
rename from lib/imageio-bmp-3.2.jar
rename to lib/imageio-bmp-3.2.1.jar
index 1946caefe..a856b1e11
Binary files a/lib/imageio-bmp-3.2.jar and b/lib/imageio-bmp-3.2.1.jar differ
diff --git a/lib/imageio-core-3.2.jar b/lib/imageio-core-3.2.1.jar
similarity index 85%
rename from lib/imageio-core-3.2.jar
rename to lib/imageio-core-3.2.1.jar
index ce9f2c2dd..60842d5ce 100644
Binary files a/lib/imageio-core-3.2.jar and b/lib/imageio-core-3.2.1.jar differ
diff --git a/lib/imageio-metadata-3.2.jar b/lib/imageio-metadata-3.2.1.jar
similarity index 85%
rename from lib/imageio-metadata-3.2.jar
rename to lib/imageio-metadata-3.2.1.jar
index 302e298a1..5c788527e 100644
Binary files a/lib/imageio-metadata-3.2.jar and b/lib/imageio-metadata-3.2.1.jar differ
diff --git a/lib/imageio-tiff-3.2.jar b/lib/imageio-tiff-3.2.1.jar
similarity index 87%
rename from lib/imageio-tiff-3.2.jar
rename to lib/imageio-tiff-3.2.1.jar
index 722cbc8b5..8abdd857b 100644
Binary files a/lib/imageio-tiff-3.2.jar and b/lib/imageio-tiff-3.2.1.jar differ
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 8913367df..464f57cf5 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -83,7 +83,7 @@
             <compilation-unit>
                 <package-root>source</package-root>
                 <package-root>htroot</package-root>
-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.jar;lib/common-io-3.2.jar;lib/common-lang-3.2.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.10.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-core-3.2.jar;lib/imageio-metadata-3.2.jar;lib/imageio-tiff-3.2.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.10.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.3.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.3.1.jar;lib/lucene-analyzers-phonetic-5.3.1.jar;lib/lucene-backward-codecs-5.3.1.jar;lib/lucene-classification-5.3.1.jar;lib/lucene-codecs-5.3.1.jar;lib/lucene-core-5.3.1.jar;lib/lucene-facet-5.3.1.jar;lib/lucene-grouping-5.3.1.jar;lib/lucene-highlighter-5.3.1.jar;lib/lucene-join-5.3.1.jar;lib/lucene-memory-5.3.1.jar;lib/lucene-misc-5.3.1.jar;lib/lucene-queries-5.3.1.jar;lib/lucene-queryparser-5.3.1.jar;lib/lucene-spatial-5.3.1.jar;lib/lucene-suggest-5.3.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.10.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.3.1.jar;lib/solr-solrj-5.3.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.10.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.10.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.3.1.jar;lib/lucene-analyzers-phonetic-5.3.1.jar;lib/lucene-backward-codecs-5.3.1.jar;lib/lucene-classification-5.3.1.jar;lib/lucene-codecs-5.3.1.jar;lib/lucene-core-5.3.1.jar;lib/lucene-facet-5.3.1.jar;lib/lucene-grouping-5.3.1.jar;lib/lucene-highlighter-5.3.1.jar;lib/lucene-join-5.3.1.jar;lib/lucene-memory-5.3.1.jar;lib/lucene-misc-5.3.1.jar;lib/lucene-queries-5.3.1.jar;lib/lucene-queryparser-5.3.1.jar;lib/lucene-spatial-5.3.1.jar;lib/lucene-suggest-5.3.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.10.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.3.1.jar;lib/solr-solrj-5.3.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
                 <built-to>lib/yacycore.jar</built-to>
                 <source-level>1.7</source-level>
             </compilation-unit>
diff --git a/pom.xml b/pom.xml
index 26ac66275..47c6447a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,11 +340,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>apache-mime4j</artifactId>
@@ -433,12 +428,12 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-bmp</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
         </dependency> 
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-tiff</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
         </dependency>        
         <dependency>
             <groupId>org</groupId>