diff --git a/.classpath b/.classpath
deleted file mode 100644
index b82bcb7..0000000
--- a/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test/unit"/>
-	<classpathentry kind="src" path="test/other"/>
-	<classpathentry kind="src" path="contrib/deploy/src/java"/>
-	<classpathentry kind="con" path="ch.epfl.lamp.sdt.launching.SCALA_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/junit-4.1.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
-	<classpathentry kind="lib" path="lib/scala-library-2.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/zkclient-0.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/zookeeper-3.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/jopt-simple-3.2.jar"/>
-	<classpathentry kind="lib" path="contrib/deploy/lib/httpclient-4.0.1.jar"/>
-	<classpathentry kind="lib" path="contrib/deploy/lib/httpcore-4.0.1.jar"/>
-	<classpathentry kind="lib" path="contrib/deploy/lib/typica.jar"/>
-	<classpathentry kind="lib" path="lib/asm-3.3.jar"/>
-	<classpathentry kind="lib" path="lib/cglib-2.2.jar"/>
-	<classpathentry kind="lib" path="lib/easymock-3.0.jar"/>
-	<classpathentry kind="lib" path="lib/objenesis-1.2.jar"/>
-	<classpathentry kind="lib" path="lib/scala-compiler-2.8.0.jar"/>
-	<classpathentry kind="lib" path="contrib/deploy/lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="contrib/deploy/lib/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="output" path="eclipse-classes"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index a35acb3..7341fd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
 dist
 *classes
+docs/
+.project
+.classpath
+.settings/
+target/
\ No newline at end of file
diff --git a/lib/zkclient-0.1-20101207.jar b/lib/zkclient-0.1-20101207.jar
new file mode 100644
index 0000000..2401393
Binary files /dev/null and b/lib/zkclient-0.1-20101207.jar differ
diff --git a/lib/zkclient-0.1.0.jar b/lib/zkclient-0.1.0.jar
deleted file mode 100644
index b08dd91..0000000
Binary files a/lib/zkclient-0.1.0.jar and /dev/null differ
diff --git a/lib/zookeeper-3.3.0.jar b/lib/zookeeper-3.3.2.jar
similarity index 70%
rename from lib/zookeeper-3.3.0.jar
rename to lib/zookeeper-3.3.2.jar
index 6920450..a3d1fa3 100644
Binary files a/lib/zookeeper-3.3.0.jar and b/lib/zookeeper-3.3.2.jar differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..d8c3f54
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,153 @@
+<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>com.linkedin.kafka</groupId>
+	<artifactId>kafka</artifactId>
+	<packaging>jar</packaging>
+	<version>0.05</version>
+	<name>Kafka</name>
+	<description>A distributed publish/subscribe messaging service</description>
+
+	<properties>
+		<scala.version>2.8.0</scala.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.zookeeper</groupId>
+			<artifactId>zookeeper</artifactId>
+			<version>3.3.2</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>jline</artifactId>
+					<groupId>jline</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<artifactId>log4j</artifactId>
+			<groupId>log4j</groupId>
+			<version>1.2.16</version>
+		</dependency>
+		<dependency>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-library</artifactId>
+			<version>${scala.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>zkclient</groupId>
+			<artifactId>zkclient</artifactId>
+			<version>0.1-20101207</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.jopt-simple</groupId>
+			<artifactId>jopt-simple</artifactId>
+			<version>3.2</version>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>scala-tools.org</id>
+			<name>Scala-tools Maven2 Repository</name>
+			<url>http://scala-tools.org/repo-releases</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>scala-tools.org</id>
+			<name>Scala-tools Maven2 Repository</name>
+			<url>http://scala-tools.org/repo-releases</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+
+		<resources>
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>**/*.scala</include>
+					<include>**/*.java</include>
+				</includes>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.3.1</version>
+				<executions>
+					<execution>
+						<id>install zkclient</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+						<configuration>
+							<packaging>jar</packaging>
+							<groupId>zkclient</groupId>
+							<artifactId>zkclient</artifactId>
+							<version>0.1-20101207</version>
+							<file>${basedir}/lib/zkclient-0.1-20101207.jar</file>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.scala-tools</groupId>
+				<artifactId>maven-scala-plugin</artifactId>
+				<version>2.15.0</version>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<phase>compile</phase>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<phase>test-compile</phase>
+					</execution>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>add-source</goal>
+							<goal>compile</goal>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<scalaVersion>${scala.version}</scalaVersion>
+					<args>
+						<arg>-target:jvm-1.5</arg>
+						<arg>-make:transitivenocp</arg>
+						<arg>-dependencyfile</arg>
+						<arg>${project.build.directory}/.scala_dependencies</arg>
+					</args>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>