diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 9575bc32d7e..533b41f4fd7 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -111,7 +111,7 @@
 		<snakeyaml.version>1.14</snakeyaml.version>
 		<solr.version>4.7.2</solr.version>
 		<spock.version>0.7-groovy-2.0</spock.version>
-		<spring.version>4.1.4.RELEASE</spring.version>
+		<spring.version>4.1.5.BUILD-SNAPSHOT</spring.version>
 		<spring-amqp.version>1.4.2.RELEASE</spring-amqp.version>
 		<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.2.RELEASE</spring-batch.version>
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
index 58e8bde5f48..ea606f16f57 100644
--- a/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.regex.Pattern;
 
 import org.springframework.beans.factory.config.YamlProcessor;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
@@ -28,12 +29,18 @@ import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.ClassUtils;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.nodes.Tag;
+import org.yaml.snakeyaml.representer.Representer;
+import org.yaml.snakeyaml.resolver.Resolver;
 
 /**
  * Strategy to load '.yml' (or '.yaml') files into a {@link PropertySource}.
  *
  * @author Dave Syer
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 public class YamlPropertySourceLoader implements PropertySourceLoader {
 
@@ -73,6 +80,21 @@ public class YamlPropertySourceLoader implements PropertySourceLoader {
 			setResources(new Resource[] { resource });
 		}
 
+		@Override
+		protected Yaml createYaml() {
+			return new Yaml(new StrictMapAppenderConstructor(), new Representer(),
+					new DumperOptions(), new Resolver() {
+						@Override
+						public void addImplicitResolver(Tag tag, Pattern regexp,
+								String first) {
+							if (tag == Tag.TIMESTAMP) {
+								return;
+							}
+							super.addImplicitResolver(tag, regexp, first);
+						}
+					});
+		}
+
 		public Map<String, Object> process() {
 			final Map<String, Object> result = new LinkedHashMap<String, Object>();
 			process(new MatchCallback() {
diff --git a/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
index c2bf7ce3c33..d8af41fefcb 100644
--- a/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -34,6 +34,7 @@ import static org.junit.Assert.assertThat;
  *
  * @author Dave Syer
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 public class YamlPropertySourceLoaderTests {
 
@@ -75,4 +76,12 @@ public class YamlPropertySourceLoaderTests {
 		assertEquals("wham", source.getProperty("foo.baz"));
 	}
 
+	@Test
+	public void timestampLikeItemsDoNotBecomeDates() throws Exception {
+		ByteArrayResource resource = new ByteArrayResource("foo: 2015-01-28".getBytes());
+		PropertySource<?> source = this.loader.load("resource", resource, null);
+		assertNotNull(source);
+		assertEquals("2015-01-28", source.getProperty("foo"));
+	}
+
 }