diff --git a/spring-datastore-riak/.classpath b/spring-datastore-riak/.classpath
new file mode 100644
index 000000000..96f09f11f
--- /dev/null
+++ b/spring-datastore-riak/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-datastore-riak/.project b/spring-datastore-riak/.project
new file mode 100644
index 000000000..45b6dcb1e
--- /dev/null
+++ b/spring-datastore-riak/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>spring-datastore-riak</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-datastore-riak/.settings/org.eclipse.jdt.core.prefs b/spring-datastore-riak/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f9a36c4a2
--- /dev/null
+++ b/spring-datastore-riak/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Tue Nov 02 11:10:32 EDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/spring-datastore-riak/.settings/org.maven.ide.eclipse.prefs b/spring-datastore-riak/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..79fd8836b
--- /dev/null
+++ b/spring-datastore-riak/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Tue Nov 02 11:10:23 EDT 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/spring-datastore-riak/pom.xml b/spring-datastore-riak/pom.xml
new file mode 100644
index 000000000..0e32db7d5
--- /dev/null
+++ b/spring-datastore-riak/pom.xml
@@ -0,0 +1,103 @@
+<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.springframework.data</groupId>
+		<artifactId>spring-datastore-keyvalue-parent</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-datastore-keyvalue-parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>spring-datastore-riak</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Datastore Riak Support</name>
+	
+	<dependencies>
+		<!--  Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+
+		<!--  Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-datastore-keyvalue-core</artifactId>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.mail</groupId>
+					<artifactId>mail</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.jms</groupId>
+					<artifactId>jms</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jdmk</groupId>
+					<artifactId>jmxtools</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jmx</groupId>
+					<artifactId>jmxri</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>runtime</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>jsr250-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+
+		<!-- Riak -->
+		<dependency>
+		  <groupId>com.basho.riak</groupId>
+		  <artifactId>riak-client</artifactId>
+		  <version>0.11.0</version>
+		</dependency>
+
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/core/RiakOperations.java b/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/core/RiakOperations.java
new file mode 100644
index 000000000..f4f7a777b
--- /dev/null
+++ b/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/core/RiakOperations.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.datastore.riak.core;
+
+public interface RiakOperations {
+
+}
diff --git a/spring-datastore-riak/src/main/resources/META-INF/spring/app-context.xml b/spring-datastore-riak/src/main/resources/META-INF/spring/app-context.xml
new file mode 100644
index 000000000..ca51b1a69
--- /dev/null
+++ b/spring-datastore-riak/src/main/resources/META-INF/spring/app-context.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<description>Example configuration to get you started.</description>
+
+	<bean id="service" class="org.springframework.datastore.ExampleService" />
+
+</beans>
diff --git a/spring-datastore-riak/src/test/java/org/springframework/datastore/riak/core/RiakTemplateIntegrationTests.java b/spring-datastore-riak/src/test/java/org/springframework/datastore/riak/core/RiakTemplateIntegrationTests.java
new file mode 100644
index 000000000..e154e38df
--- /dev/null
+++ b/spring-datastore-riak/src/test/java/org/springframework/datastore/riak/core/RiakTemplateIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.datastore.riak.core;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class RiakTemplateIntegrationTests {
+
+	@Before
+	public void setUp() {
+		
+	}
+	
+	@Test
+	public void conversions() {
+	
+	}
+}
diff --git a/spring-datastore-riak/src/test/resources/log4j.properties b/spring-datastore-riak/src/test/resources/log4j.properties
new file mode 100644
index 000000000..6d5422d74
--- /dev/null
+++ b/spring-datastore-riak/src/test/resources/log4j.properties
@@ -0,0 +1,13 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.apache.activemq=ERROR
+log4j.category.org.springframework.batch=DEBUG
+log4j.category.org.springframework.transaction=INFO
+
+log4j.category.org.hibernate.SQL=DEBUG
+# for debugging datasource initialization
+# log4j.category.test.jdbc=DEBUG
diff --git a/spring-datastore-riak/src/test/resources/org/springframework/datastore/ExampleConfigurationTests-context.xml b/spring-datastore-riak/src/test/resources/org/springframework/datastore/ExampleConfigurationTests-context.xml
new file mode 100644
index 000000000..4717a9b6b
--- /dev/null
+++ b/spring-datastore-riak/src/test/resources/org/springframework/datastore/ExampleConfigurationTests-context.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<import resource="classpath:/META-INF/spring/app-context.xml"/> 
+
+</beans>
diff --git a/spring-datastore-riak/template.mf b/spring-datastore-riak/template.mf
new file mode 100644
index 000000000..473916a41
--- /dev/null
+++ b/spring-datastore-riak/template.mf
@@ -0,0 +1,21 @@
+Bundle-SymbolicName: org.springframework.datastore.redis
+Bundle-Name: Spring Datastore Redis Support
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package: 
+ sun.reflect;version="0";resolution:=optional
+Import-Template: 
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.dao.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
+ org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)",
+ org.springframework.datastore.*;version="[1.0.0, 2.0.0)",
+ org.springframework.datastore.persistence.*;version="[1.0.0, 2.0.0)",
+ org.springframework.datastore.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.w3c.dom.*;version="0",
+ com.basho.riak.*;version="[0.11.0, 1.0.0)",
+