diff --git a/distribution/src/main/bin/ycsb b/distribution/src/main/bin/ycsb
index 50b52fe89715962b170b8c15c314f1cbd0bbcdbc..8e4d42eb155830648f8473f658f6f46869b6efb1 100755
--- a/distribution/src/main/bin/ycsb
+++ b/distribution/src/main/bin/ycsb
@@ -26,6 +26,7 @@ DATABASES = {
     "jdbc"         : "com.yahoo.ycsb.db.JdbcDBClient",
     "mapkeeper"    : "com.yahoo.ycsb.db.MapKeeperClient",
     "mongodb"      : "com.yahoo.ycsb.db.MongoDbClient",
+    "nosqldb"      : "com.yahoo.ycsb.db.NoSqlDbClient",
     "redis"        : "com.yahoo.ycsb.db.RedisClient", 
     "voldemort"    : "com.yahoo.ycsb.db.VoldemortClient", 
 }
diff --git a/db/nosqldb/lib/README b/nosqldb/README
similarity index 73%
rename from db/nosqldb/lib/README
rename to nosqldb/README
index 83586631cb579474a5c0258827c52d76b6863fa0..9b5f3b615601566aceb82726fe85908da3e451f5 100644
--- a/db/nosqldb/lib/README
+++ b/nosqldb/README
@@ -1,6 +1,17 @@
 This directory should contain kvclient-1.2.123.jar for building
 and running Oracle NoSQL Database client.
 
+INSTALL
+
+Download kv-ce-1.2.123.tar.gz from here:
+
+http://www.oracle.com/technetwork/database/nosqldb/downloads/index.html
+
+Install kvclient-1.2.123.jar in your local maven repository:
+
+    mvn install:install-file -Dfile=kv-1.2.123/lib/kvclient-1.2.123.jar \
+        -DgroupId=com.oracle -DartifactId=kvclient -Dversion=1.2.123 -Dpackaging=jar
+
 BUILD
 
 Oracle NoSQL Database client can be compiled using target:
diff --git a/nosqldb/pom.xml b/nosqldb/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ad367ade6191c1bbef48cc0a0449d9b51acb01d
--- /dev/null
+++ b/nosqldb/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.apache.ycsb</groupId>
+    <artifactId>root</artifactId>
+    <version>0.1.3</version>
+  </parent>
+  
+  <artifactId>nosqldb-binding</artifactId>
+  <name>Oracle NoSQL Database Binding</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.oracle</groupId>
+      <artifactId>kvclient</artifactId>
+      <version>1.2.123</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ycsb</groupId>
+      <artifactId>core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+     <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+  <repository>
+  <id>central</id>
+  <url>file:///Users/michi/.m2/repository</url>
+  </repository>
+  </repositories>
+</project>
diff --git a/db/nosqldb/nosqldb.properties b/nosqldb/src/main/conf/nosqldb.properties
similarity index 100%
rename from db/nosqldb/nosqldb.properties
rename to nosqldb/src/main/conf/nosqldb.properties
diff --git a/db/nosqldb/script.txt b/nosqldb/src/main/conf/script.txt
similarity index 100%
rename from db/nosqldb/script.txt
rename to nosqldb/src/main/conf/script.txt
diff --git a/db/nosqldb/src/com/yahoo/ycsb/db/NoSqlDbClient.java b/nosqldb/src/main/java/com/yahoo/ycsb/db/NoSqlDbClient.java
similarity index 100%
rename from db/nosqldb/src/com/yahoo/ycsb/db/NoSqlDbClient.java
rename to nosqldb/src/main/java/com/yahoo/ycsb/db/NoSqlDbClient.java
diff --git a/pom.xml b/pom.xml
index b575bad6ead1427e482bd24b6aac5eae4bc40309..fbc4d6df74f71594d53d2798e5b88d4b3a213c75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
     <module>jdbc</module>
     <module>mapkeeper</module>
     <module>mongodb</module>
+    <!--module>nosqldb</module-->
     <module>redis</module>
     <module>voldemort</module>
     <module>distribution</module>