diff --git a/examples/config/realtime/runtime.properties b/examples/config/realtime/runtime.properties
index b529b63792b..cac3405e678 100644
--- a/examples/config/realtime/runtime.properties
+++ b/examples/config/realtime/runtime.properties
@@ -4,7 +4,7 @@ druid.port=8083
 
 druid.zk.service.host=localhost
 
-druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.10"]
+druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.10","io.druid.extensions:druid-kafka-seven:0.6.10"]
 
 druid.db.connector.connectURI=jdbc\:mysql\://localhost\:3306/druid
 druid.db.connector.user=druid
diff --git a/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java b/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java
index 658b64bf82b..18261fde99c 100644
--- a/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java
+++ b/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java
@@ -22,10 +22,10 @@ package io.druid.firehose.kafka;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import io.druid.initialization.DruidModule;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -35,7 +35,7 @@ public class KafkaEightDruidModule implements DruidModule
   @Override
   public List<? extends Module> getJacksonModules()
   {
-    return Arrays.<Module>asList(
+    return ImmutableList.of(
         new SimpleModule("KafkaEightFirehoseModule")
             .registerSubtypes(
                 new NamedType(KafkaEightFirehoseFactory.class, "kafka-0.8")
diff --git a/kafka-seven/src/main/java/io/druid/firehose/kafka/KafkaSevenDruidModule.java b/kafka-seven/src/main/java/io/druid/firehose/kafka/KafkaSevenDruidModule.java
index 11682a669aa..5a39fdae5aa 100644
--- a/kafka-seven/src/main/java/io/druid/firehose/kafka/KafkaSevenDruidModule.java
+++ b/kafka-seven/src/main/java/io/druid/firehose/kafka/KafkaSevenDruidModule.java
@@ -22,10 +22,10 @@ package io.druid.firehose.kafka;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import io.druid.initialization.DruidModule;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -35,7 +35,7 @@ public class KafkaSevenDruidModule implements DruidModule
   @Override
   public List<? extends Module> getJacksonModules()
   {
-    return Arrays.<Module>asList(
+    return ImmutableList.of(
         new SimpleModule("KafkaSevenFirehoseModule")
             .registerSubtypes(
                 new NamedType(KafkaSevenFirehoseFactory.class, "kafka-0.7.2")
diff --git a/pom.xml b/pom.xml
index 72b65ff271d..c4d353ddbb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
   ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.druid</groupId>
     <artifactId>druid</artifactId>
@@ -30,8 +31,8 @@
         <connection>scm:git:ssh://git@github.com/metamx/druid.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/metamx/druid.git</developerConnection>
         <url>http://www.github.com/metamx/druid</url>
-      <tag>druid-0.6.10-SNAPSHOT</tag>
-  </scm>
+        <tag>${artifactId}-${project.version}</tag>
+    </scm>
 
     <prerequisites>
         <maven>3.0.3</maven>
@@ -56,6 +57,7 @@
         <module>hdfs-storage</module>
         <module>s3-extensions</module>
         <module>kafka-seven</module>
+        <module>kafka-eight</module>
     </modules>
 
     <dependencyManagement>
@@ -412,24 +414,24 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-              <groupId>com.ircclouds.irc</groupId>
-              <artifactId>irc-api</artifactId>
-              <version>1.0-0011</version>
+                <groupId>com.ircclouds.irc</groupId>
+                <artifactId>irc-api</artifactId>
+                <version>1.0-0011</version>
             </dependency>
             <dependency>
-              <groupId>com.maxmind.geoip2</groupId>
-              <artifactId>geoip2</artifactId>
-              <version>0.4.0</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.apache.httpcomponents</groupId>
-                  <artifactId>httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.apache.httpcomponents</groupId>
-                  <artifactId>httpcore</artifactId>
-                </exclusion>
-              </exclusions>
+                <groupId>com.maxmind.geoip2</groupId>
+                <artifactId>geoip2</artifactId>
+                <version>0.4.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
         </dependencies>