diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml
index 769ba3a2a..daa112025 100644
--- a/spring-data-riak/pom.xml
+++ b/spring-data-riak/pom.xml
@@ -14,7 +14,7 @@
 
   <dependencies>
 
-    <!-- Logging -->
+    <!-- Logging
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -53,6 +53,12 @@
       </exclusions>
       <scope>provided</scope>
     </dependency>
+    -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
 
     <!--  Spring -->
     <dependency>
diff --git a/spring-data-riak/template.mf b/spring-data-riak/template.mf
index 0b4985d35..5ca4133ed 100644
--- a/spring-data-riak/template.mf
+++ b/spring-data-riak/template.mf
@@ -19,6 +19,7 @@ Import-Template:
  org.springframework.data.persistence.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.document.*;version="[1.0.0, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.slf4j.*;version="[1.5.10, 2.0.0)",
  org.w3c.dom.*;version="0",
  org.codehaus.jackson.*;version="[1.5.6, 1.5.6)",
@@ -27,4 +28,5 @@ Import-Template:
  groovy.lang.*;version="[1.7.5, 2.0.0)",
  groovy.util.*;version="[1.7.5, 2.0.0)",
  javax.activation.*;version="[1.1, 2.0)",
- javax.mail.*;version="[1.4.0, 2.0.0)",
\ No newline at end of file
+ javax.mail.*;version="[1.4.0, 2.0.0)",
+ org.apache.commons.cli.*;version="[1.2, 2.0)",
\ No newline at end of file