diff --git a/pom.xml b/pom.xml
index b92a63d9fb..a5fc6365fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,6 @@
 				<module>spring-boot-actuator</module>
 				<module>spring-boot-starters</module>
 				<module>spring-boot-cli</module>
-				<module>spring-boot-maven-settings</module>
 			</modules>
 		</profile>
 		<profile>
diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index cef0d62138..9946a4d83f 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -36,11 +36,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-boot-maven-settings</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy-xml</artifactId>
@@ -82,6 +77,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-settings-builder</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.aether</groupId>
 			<artifactId>aether-api</artifactId>
diff --git a/spring-boot-maven-settings/src/main/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
similarity index 96%
rename from spring-boot-maven-settings/src/main/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfiguration.java
rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
index 24745451e8..16c46d70cd 100644
--- a/spring-boot-maven-settings/src/main/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfiguration.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.boot.maven.settings;
+package org.springframework.boot.cli.compiler.grape;
 
 import java.io.File;
 
@@ -23,7 +23,6 @@ import org.eclipse.aether.util.repository.ConservativeAuthenticationSelector;
 import org.eclipse.aether.util.repository.DefaultAuthenticationSelector;
 import org.eclipse.aether.util.repository.DefaultMirrorSelector;
 import org.eclipse.aether.util.repository.DefaultProxySelector;
-import org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration;
 
 /**
  * Auto-configuration for a RepositorySystemSession that uses Maven's settings.xml to
diff --git a/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
new file mode 100644
index 0000000000..6020bac3eb
--- /dev/null
+++ b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
@@ -0,0 +1 @@
+org.springframework.boot.cli.compiler.grape.SettingsXmlRepositorySystemSessionAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-maven-settings/src/test/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
similarity index 88%
rename from spring-boot-maven-settings/src/test/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
rename to spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
index b6aea41ed8..2398229b7c 100644
--- a/spring-boot-maven-settings/src/test/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
@@ -1,4 +1,4 @@
-package org.springframework.boot.maven.settings;
+package org.springframework.boot.cli.compiler.grape;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
 import org.apache.maven.settings.building.SettingsBuildingException;
@@ -11,6 +11,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.boot.cli.compiler.grape.SettingsXmlRepositorySystemSessionAutoConfiguration;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/spring-boot-maven-settings/pom.xml b/spring-boot-maven-settings/pom.xml
deleted file mode 100644
index 6afa08dd11..0000000000
--- a/spring-boot-maven-settings/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-boot-parent</relativePath>
-	</parent>
-	<artifactId>spring-boot-maven-settings</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
-	</properties>
-	<dependencies>
-		<!-- Compile -->
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-settings-builder</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-util</artifactId>
-		</dependency>
-		<!-- Provided -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-cli</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-boot-maven-settings/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration b/spring-boot-maven-settings/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
deleted file mode 100644
index 10fb8b41be..0000000000
--- a/spring-boot-maven-settings/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.maven.settings.SettingsXmlRepositorySystemSessionAutoConfiguration
\ No newline at end of file