diff --git a/configserver/pom.xml b/configserver/pom.xml
new file mode 100644
index 0000000..9be0006
--- /dev/null
+++ b/configserver/pom.xml
@@ -0,0 +1,106 @@
+<?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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-sample-configserver</artifactId>
+	<packaging>jar</packaging>
+
+	<name>spring-cloud-sample-configserver</name>
+	<description>Demo project for Spring Cloud</description>
+
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>Angel.SR4</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<java.version>1.7</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<!--skip deploy (this is just a test module) -->
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>http://repo.spring.io/libs-snapshot-local</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>http://repo.spring.io/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-releases</id>
+			<name>Spring Releases</name>
+			<url>http://repo.spring.io/release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>http://repo.spring.io/libs-snapshot-local</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>http://repo.spring.io/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-releases</id>
+			<name>Spring Releases</name>
+			<url>http://repo.spring.io/release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+</project>
diff --git a/configserver/src/main/config/application.yml b/configserver/src/main/config/application.yml
new file mode 100644
index 0000000..e69de29
diff --git a/configserver/src/main/java/demo/ConfigServerApplication.java b/configserver/src/main/java/demo/ConfigServerApplication.java
new file mode 100644
index 0000000..98cb9f3
--- /dev/null
+++ b/configserver/src/main/java/demo/ConfigServerApplication.java
@@ -0,0 +1,15 @@
+package demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+@SpringBootApplication
+@EnableConfigServer
+public class ConfigServerApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ConfigServerApplication.class, args);
+	}
+
+}
diff --git a/configserver/src/main/resources/application.yml b/configserver/src/main/resources/application.yml
new file mode 100644
index 0000000..79d5ceb
--- /dev/null
+++ b/configserver/src/main/resources/application.yml
@@ -0,0 +1,11 @@
+server:
+  port: 8888
+spring:
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/spring-cloud-samples/config-repo
+        encrypt:
+          enabled: false
+  
\ No newline at end of file
diff --git a/configserver/src/main/resources/bootstrap.yml b/configserver/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..d97f6fd
--- /dev/null
+++ b/configserver/src/main/resources/bootstrap.yml
@@ -0,0 +1,22 @@
+spring:
+  application:
+    name: configserver
+
+---
+spring:
+  profiles: default
+
+encrypt:
+  key: ${SECRET_KEY:foo} # normally this would be an environment variable
+
+---
+spring:
+  profiles: rsa
+
+encrypt:
+  failOnError: false
+  keyStore:
+    location: classpath:keystore.jks
+    password: ${KEYSTORE_PASSWORD:foobar} # don't use a default in production
+    alias: test
+
diff --git a/configserver/src/main/resources/keystore.jks b/configserver/src/main/resources/keystore.jks
new file mode 100644
index 0000000..0ad98ea
Binary files /dev/null and b/configserver/src/main/resources/keystore.jks differ
diff --git a/configserver/src/test/java/demo/ConfigServerApplicationTests.java b/configserver/src/test/java/demo/ConfigServerApplicationTests.java
new file mode 100644
index 0000000..55a4328
--- /dev/null
+++ b/configserver/src/test/java/demo/ConfigServerApplicationTests.java
@@ -0,0 +1,20 @@
+package demo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = ConfigServerApplication.class)
+@WebAppConfiguration
+@DirtiesContext
+public class ConfigServerApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/pom.xml b/pom.xml
index 3801ccc..a634150 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
 		<module>config-client</module>
 		<module>config-client-decrypt</module>
 		<module>config-retry</module>
+		<module>configserver</module>
 		<module>configserver-eureka</module>
 		<module>eureka-first</module>
 		<module>eureka-noweb</module>