diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 27f566de24..5458f5e8a2 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -15,6 +15,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.version>3.0.5</maven.version>
+		<spring-snapshot-build-profile-active>false</spring-snapshot-build-profile-active>
 	</properties>
 	<developers>
 		<developer>
@@ -33,7 +34,7 @@
 	</scm>
 	<dependencyManagement>
 		<dependencies>
-			<!-- Additional Dependencies the consumers of spring-boot-dependencies 
+			<!-- Additional Dependencies the consumers of spring-boot-dependencies
 				will generally not need -->
 			<dependency>
 				<groupId>net.sf.jopt-simple</groupId>
@@ -293,13 +294,16 @@
 	</build>
 	<profiles>
 		<profile>
-			<!-- Allow snapshots and milestones when building locally, this profile 
+			<!-- Allow snapshots and milestones when building locally, this profile
 				should not be enabled during release. -->
 			<id>spring-snapshot-build</id>
 			<activation>
 				<!-- FIXME disable this during release -->
 				<activeByDefault>true</activeByDefault>
 			</activation>
+			<properties>
+				<spring-snapshot-build-profile-active>true</spring-snapshot-build-profile-active>
+			</properties>
 			<repositories>
 				<repository>
 					<id>spring-milestones</id>
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index 20733e1abe..e9ece2737f 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -277,6 +277,9 @@
 	<profiles>
 		<profile>
 			<id>spring-snapshot-build</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<repositories>
 				<repository>
 					<id>spring-milestones</id>
diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml
index d43013f34e..e4bb65bbcb 100644
--- a/spring-boot-starters/src/main/parent/pom.xml
+++ b/spring-boot-starters/src/main/parent/pom.xml
@@ -277,6 +277,9 @@
 	<profiles>
 		<profile>
 			<id>spring-snapshot-build</id>
+			<activation>
+				<activeByDefault>@{spring-snapshot-build-profile-active}</activeByDefault>
+			</activation>
 			<repositories>
 				<repository>
 					<id>spring-milestones</id>