diff --git a/pom.xml b/pom.xml
index 1c77b5e8749..04b155c032f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,20 +96,15 @@
 
         <dependency>
             <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk</artifactId>
+            <artifactId>aws-java-sdk-ec2</artifactId>
+            <version>${amazonaws.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
             <version>${amazonaws.version}</version>
             <scope>compile</scope>
-            <exclusions>
-                <!-- jackson is optional -->
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-core-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-mapper-asl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- We need to explicitly set the common codec version since aws-java-sdk pulls the wrong version -->
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
index 532a360c2f8..0b20041a9db 100644
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@@ -19,7 +19,9 @@
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>
-                <include>com.amazonaws:aws-java-sdk</include>
+                <include>com.amazonaws:aws-java-sdk-core</include>
+                <include>com.amazonaws:aws-java-sdk-ec2</include>
+                <include>com.amazonaws:aws-java-sdk-s3</include>
                 <include>commons-codec:commons-codec</include>
             </includes>
         </dependencySet>