diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml
new file mode 100644
index 0000000..fa6bd54
--- /dev/null
+++ b/configserver-bootstrap/pom.xml
@@ -0,0 +1,55 @@
+<?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-bootstrap</artifactId>
+	<version>Brixton.BUILD-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>spring-cloud-sample-configserver-bootstrap</name>
+	<description>Demo project for Spring Cloud</description>
+
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>Brixton.BUILD-SNAPSHOT</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<start-class>demo.DemoApplication</start-class>
+		<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>
+
+</project>
diff --git a/configserver-bootstrap/src/main/java/demo/ConfigServerBootstrapApplication.java b/configserver-bootstrap/src/main/java/demo/ConfigServerBootstrapApplication.java
new file mode 100644
index 0000000..0968a0a
--- /dev/null
+++ b/configserver-bootstrap/src/main/java/demo/ConfigServerBootstrapApplication.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 ConfigServerBootstrapApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ConfigServerBootstrapApplication.class, args);
+	}
+
+}
diff --git a/configserver-bootstrap/src/main/resources/application.yml b/configserver-bootstrap/src/main/resources/application.yml
new file mode 100644
index 0000000..480bdab
--- /dev/null
+++ b/configserver-bootstrap/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+server:
+  port: 8787
+management:
+  contextPath: /admin
\ No newline at end of file
diff --git a/configserver-bootstrap/src/main/resources/bootstrap.yml b/configserver-bootstrap/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..258dbb5
--- /dev/null
+++ b/configserver-bootstrap/src/main/resources/bootstrap.yml
@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: configserver
+  cloud:
+    config:
+      server:
+        bootstrap: true
+        git:
+          uri: https://github.com/spring-cloud-samples/config-repo
+
+---
+spring:
+  profiles: native
+  cloud:
+    config:
+      server:
+        native:
+          searchLocations: /tmp/
\ No newline at end of file
diff --git a/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java b/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java
new file mode 100644
index 0000000..bb086bf
--- /dev/null
+++ b/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.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 = ConfigServerBootstrapApplication.class)
+@WebAppConfiguration
+@DirtiesContext
+public class ConfigServerEurekaApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/pom.xml b/pom.xml
index b6cbdcb..b0c66d9 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-bootstrap</module>
 		<module>configserver-eureka</module>
 		<module>eureka-first</module>
 		<module>eureka-noweb</module>