diff --git a/spring-bootstrap-cli/src/main/scripts/spring b/spring-bootstrap-cli/src/main/scripts/spring
index 0a2f0faa32d..d657a9eff43 100755
--- a/spring-bootstrap-cli/src/main/scripts/spring
+++ b/spring-bootstrap-cli/src/main/scripts/spring
@@ -62,22 +62,15 @@ TARGETDIR=target/classes
 if [ -f build.gradle ]; then
     TARGETDIR=build/classes/main
 fi
-if [ -f ${TARGETDIR} ]; then
-	if [ "${CLASSPATH}" == "" ]; then
-		CLASSPATH="${TARGETDIR}"
-	else
-    	CLASSPATH="${CLASSPATH}":"${TARGETDIR}"
-	fi
-fi
-
-if [ "${CLASSPATH}" == "" ]; then
-	CLASSPATH="${SPRING_BIN}"
-else
-   	CLASSPATH="${CLASSPATH}":"${SPRING_BIN}"
-fi
 
-for f in "${SPRING_HOME}"/classes "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar; do
-    [ -f $f ] && CLASSPATH="${CLASSPATH}":$f
+for f in "${TARGETDIR}" "${SPRING_HOME}"/classes "${SPRING_BIN}" "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar; do
+    if [ -f $f -o -d $f ]; then
+    	if [ "${CLASSPATH}" == "" ]; then
+			CLASSPATH="${f}"
+		else
+   			CLASSPATH="${CLASSPATH}":"${f}"
+		fi
+	fi
 done
 
 if $cygwin; then
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy
index 77d6d26b368..6cecd252d27 100644
--- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy
+++ b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy
@@ -1,4 +1,5 @@
-@Grab("org.springframework.bootstrap:spring-bootstrap-service:0.0.1-SNAPSHOT")
-@Grab("org.springframework.bootstrap:spring-bootstrap-web-application:0.0.1-SNAPSHOT")
+@Grab("org.springframework.bootstrap:spring-bootstrap-actuator:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.bootstrap:spring-bootstrap-web-starter:0.5.0.BUILD-SNAPSHOT")
+@ComponentScan("org.springframework.bootstrap.sample.service")
 class Start {
 }
diff --git a/spring-bootstrap-starters/pom.xml b/spring-bootstrap-starters/pom.xml
index 4cc44d95053..93d72070ca3 100644
--- a/spring-bootstrap-starters/pom.xml
+++ b/spring-bootstrap-starters/pom.xml
@@ -20,6 +20,7 @@
 		<module>spring-bootstrap-batch-starter</module>
 		<module>spring-bootstrap-integration-starter</module>
 		<module>spring-bootstrap-jpa-starter</module>
+		<module>spring-bootstrap-tomcat-starter</module>
 		<module>spring-bootstrap-web-starter</module>
 	</modules>
     <dependencyManagement>
@@ -49,6 +50,11 @@
           <artifactId>spring-bootstrap-web-starter</artifactId>
           <version>${spring.bootstrap.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.springframework.bootstrap</groupId>
+          <artifactId>spring-bootstrap-tomcat-starter</artifactId>
+          <version>${spring.bootstrap.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.springframework.bootstrap</groupId>
           <artifactId>spring-bootstrap-jpa-starter</artifactId>
diff --git a/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml
new file mode 100644
index 00000000000..25550156b8f
--- /dev/null
+++ b/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml
@@ -0,0 +1,39 @@
+<?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.bootstrap</groupId>
+		<artifactId>spring-bootstrap-starters</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-bootstrap-tomcat-starter</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.bootstrap</groupId>
+			<artifactId>spring-bootstrap-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-logging-juli</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+		</dependency>
+	</dependencies>
+</project>