diff --git a/docs-core/pom.xml b/docs-core/pom.xml
index c4145a62..3281d683 100644
--- a/docs-core/pom.xml
+++ b/docs-core/pom.xml
@@ -168,6 +168,11 @@
       <groupId>com.github.jai-imageio</groupId>
       <artifactId>jai-imageio-core</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>com.github.jai-imageio</groupId>
+      <artifactId>jai-imageio-jpeg2000</artifactId>
+    </dependency>
     
     <!-- Test dependencies -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index 19d0a1a2..0f862c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <org.mindrot.jbcrypt>0.3m</org.mindrot.jbcrypt>
     <org.apache.lucene.version>5.5.0</org.apache.lucene.version>
     <org.imgscalr.imgscalr-lib.version>4.2</org.imgscalr.imgscalr-lib.version>
-    <org.apache.pdfbox.pdfbox.version>2.0.0-RC3</org.apache.pdfbox.pdfbox.version>
+    <org.apache.pdfbox.pdfbox.version>2.0.8</org.apache.pdfbox.pdfbox.version>
     <org.bouncycastle.bcprov-jdk15on.version>1.54</org.bouncycastle.bcprov-jdk15on.version>
     <joda-time.joda-time.version>2.9.2</joda-time.joda-time.version>
     <org.hibernate.hibernate.version>5.1.0.Final</org.hibernate.hibernate.version>
@@ -47,6 +47,7 @@
     <com.icegreen.greenmail.version>1.5.7</com.icegreen.greenmail.version>
     <com.sun.mail.javax.mail.version>1.5.6</com.sun.mail.javax.mail.version>
     <org.jsoup.jsoup.version>1.11.2</org.jsoup.jsoup.version>
+    <com.github.jai-imageio.jai-imageio-jpeg2000.version>1.3.0</com.github.jai-imageio.jai-imageio-jpeg2000.version>
 
     <org.eclipse.jetty.jetty-server.version>9.2.13.v20150730</org.eclipse.jetty.jetty-server.version>
     <org.eclipse.jetty.jetty-webapp.version>9.2.13.v20150730</org.eclipse.jetty.jetty-webapp.version>
@@ -455,6 +456,13 @@
         <artifactId>imageio-jpeg</artifactId>
         <version>${com.twelvemonkeys.imageio.version}</version>
       </dependency>
+
+      <!-- JPEG 2000 -->
+      <dependency>
+        <groupId>com.github.jai-imageio</groupId>
+        <artifactId>jai-imageio-jpeg2000</artifactId>
+        <version>${com.github.jai-imageio.jai-imageio-jpeg2000.version}</version>
+      </dependency>
       
       <!-- Only JBIG2 -->
       <dependency>