diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml
index f54dc655639..c7af0a170bb 100644
--- a/hdfs-storage/pom.xml
+++ b/hdfs-storage/pom.xml
@@ -41,11 +41,15 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
         </dependency>
-        <!-- override httpclient version from jets3t -->
+        <!-- override httpclient / httpcore version from jets3t -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index e7231c4ec14..bd26b712f73 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -56,11 +56,15 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
         </dependency>
-        <!-- override httpclient version from jets3t -->
+        <!-- override httpclient / httpcore version from jets3t -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 2e3c6aade97..f67fd444892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,6 +383,11 @@
                 <artifactId>httpclient</artifactId>
                 <version>4.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.2</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml
index 142ef344b4b..942c456ef6d 100644
--- a/s3-extensions/pom.xml
+++ b/s3-extensions/pom.xml
@@ -41,11 +41,15 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
         </dependency>
-        <!-- override httpclient version from jets3t -->
+        <!-- override httpclient / httpcore version from jets3t -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.metamx</groupId>
             <artifactId>emitter</artifactId>
diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
index 34c23f850c9..f2675251f19 100644
--- a/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
+++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
@@ -30,6 +30,7 @@ import io.druid.guice.LazySingleton;
 import io.druid.initialization.DruidModule;
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.impl.rest.httpclient.RestS3Service;
+import org.jets3t.service.security.AWSCredentials;
 
 import java.util.List;
 
@@ -60,14 +61,14 @@ public class S3StorageDruidModule implements DruidModule
 
   @Provides
   @LazySingleton
-  public org.jets3t.service.security.AWSCredentials  getJets3tAWSCredentials(AWSCredentialsConfig config)
+  public AWSCredentials getJets3tAWSCredentials(AWSCredentialsConfig config)
   {
-    return new org.jets3t.service.security.AWSCredentials(config.getAccessKey(), config.getSecretKey());
+    return new AWSCredentials(config.getAccessKey(), config.getSecretKey());
   }
 
   @Provides
   @LazySingleton
-  public RestS3Service getRestS3Service(org.jets3t.service.security.AWSCredentials credentials)
+  public RestS3Service getRestS3Service(AWSCredentials credentials)
   {
     try {
       return new RestS3Service(credentials);