diff --git a/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java
index 72cff54bfe..3635f71d88 100644
--- a/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-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.
@@ -213,6 +213,9 @@ public class VcapApplicationListener implements
 			if (value instanceof String) {
 				properties.put(key, value);
 			}
+			else if (value instanceof Number) {
+				properties.put(key, value.toString());
+			}
 			else if (value instanceof Map) {
 				// Need a compound key
 				@SuppressWarnings("unchecked")
diff --git a/spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.java
index 6cce6e7685..d0a0675d4f 100644
--- a/spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.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.
@@ -75,6 +75,10 @@ public class VcapApplicationListenerTests {
 		this.initializer.onApplicationEvent(this.event);
 		assertEquals("mysql",
 				this.context.getEnvironment().getProperty("vcap.services.mysql.name"));
+		assertEquals(
+				"3306",
+				this.context.getEnvironment().getProperty(
+						"vcap.services.mysql.credentials.port"));
 	}
 
 	@Test
@@ -86,5 +90,9 @@ public class VcapApplicationListenerTests {
 		this.initializer.onApplicationEvent(this.event);
 		assertEquals("mysql",
 				this.context.getEnvironment().getProperty("vcap.services.mysql.name"));
+		assertEquals(
+				"3306",
+				this.context.getEnvironment().getProperty(
+						"vcap.services.mysql.credentials.port"));
 	}
 }