diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 6302dc6708f..ebafef6c887 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -71,6 +71,7 @@
 		<module>spring-boot-starter-velocity</module>
 		<module>spring-boot-starter-web</module>
 		<module>spring-boot-starter-websocket</module>
+		<module>spring-boot-starter-web-services</module>
 		<module>spring-boot-starter-ws</module>
 	</modules>
 
diff --git a/spring-boot-starters/spring-boot-starter-web-services/pom.xml b/spring-boot-starters/spring-boot-starter-web-services/pom.xml
new file mode 100644
index 00000000000..abf40a5e2d9
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-web-services/pom.xml
@@ -0,0 +1,38 @@
+<?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-starters</artifactId>
+		<version>1.4.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-web-services</artifactId>
+	<name>Spring Boot Web Services Starter</name>
+	<description>Starter for using Spring Web Services</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-oxm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>spring-ws-core</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-boot-starters/spring-boot-starter-web-services/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-web-services/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000000..d0da5438acc
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-web-services/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-ws-core
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-ws/pom.xml b/spring-boot-starters/spring-boot-starter-ws/pom.xml
index 659d2a474a2..86948b45938 100644
--- a/spring-boot-starters/spring-boot-starter-ws/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-ws/pom.xml
@@ -7,8 +7,9 @@
 		<version>1.4.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-starter-ws</artifactId>
-	<name>Spring Boot Web Services Starter</name>
-	<description>Starter for using Spring Web Services</description>
+	<name>spring-boot-starter-ws (DEPRECATED)</name>
+	<description>Starter for using Spring Web Services. Deprecated as of 1.4 in favor of
+		spring-boot-starter-web-services</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-boot-starters/spring-boot-starter-ws/src/main/java/org/springframework/boot/starter/ws/WsStarterDeprecationWarningAutoConfiguration.java b/spring-boot-starters/spring-boot-starter-ws/src/main/java/org/springframework/boot/starter/ws/WsStarterDeprecationWarningAutoConfiguration.java
new file mode 100644
index 00000000000..a32271268e0
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-ws/src/main/java/org/springframework/boot/starter/ws/WsStarterDeprecationWarningAutoConfiguration.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2016 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.boot.starter.ws;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} to print a deprecation warning about
+ * the starter.
+ *
+ * @author Stephane Nicoll
+ * @since 1.4.0
+ */
+@Configuration
+@Deprecated
+public class WsStarterDeprecationWarningAutoConfiguration {
+
+	private static final Log logger = LogFactory
+			.getLog(WsStarterDeprecationWarningAutoConfiguration.class);
+
+	@PostConstruct
+	public void logWarning() {
+		logger.warn("spring-boot-starter-ws is deprecated as of Spring Boot 1.4, "
+				+ "please migrate to spring-boot-starter-web-services");
+	}
+
+}
diff --git a/spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.factories b/spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000000..def429f3e6b
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.boot.starter.ws.WsStarterDeprecationWarningAutoConfiguration