diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java
index 1b7cefbf..8ac84b74 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java
@@ -20,6 +20,7 @@ import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -53,7 +54,7 @@ public class ConfigClientAutoConfiguration {
 	@Configuration
 	@ConditionalOnClass(HealthIndicator.class)
 	@ConditionalOnBean(ConfigServicePropertySourceLocator.class)
-	@ConditionalOnProperty(value = "spring.cloud.config.health.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = "health.config.enabled", matchIfMissing = true)
 	protected static class ConfigServerHealthIndicatorConfiguration {
 
 		@Bean
@@ -63,4 +64,20 @@ public class ConfigClientAutoConfiguration {
 		}
 	}
 
+	@ConfigurationProperties("health.config")
+	public static class Health {
+		/**
+		 * Flag to inidicate that the config server health indicator should be installed. 
+		 */
+		boolean enabled;
+
+		public boolean isEnabled() {
+			return enabled;
+		}
+
+		public void setEnabled(boolean enabled) {
+			this.enabled = enabled;
+		}
+	}
+
 }
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
index 9e0d7b80..9b8f814d 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
@@ -49,20 +49,37 @@ public class ConfigClientProperties {
 	@Value("${spring.application.name:application}")
 	private String name;
 
+	/**
+	 * The label name to use to pull remote configuration properties. The default is set
+	 * on the server (generally "master" for a git based server).
+	 */
 	private String label;
 
+	/**
+	 * The username to use (HTTP Basic) when contacting the remote server.
+	 */
 	private String username;
 
+	/**
+	 * The password to use (HTTP Basic) when contacting the remote server.
+	 */
 	private String password;
 
+	/**
+	 * The URI of the remote server (default http://localhost:8888).
+	 */
 	private String uri = "http://localhost:8888";
 
+	/**
+	 * Discovery properties.
+	 */
 	private Discovery discovery = new Discovery();
 
+	/**
+	 * Flag to indicate that failure to connect to the server is fatal (default false).
+	 */
 	private boolean failFast = false;
 	
-	private Health health = new Health();
-
 	private ConfigClientProperties() {
 	}
 
@@ -219,10 +236,6 @@ public class ConfigClientProperties {
 		}
 
 	}
-	
-	public Health getHealth() {
-		return health;
-	}
 
 	public ConfigClientProperties override(
 			org.springframework.core.env.Environment environment) {
@@ -241,25 +254,14 @@ public class ConfigClientProperties {
 		}
 		return override;
 	}
-	
-	public static class Health {
-		private boolean enabled = true;
-
-		public boolean isEnabled() {
-			return enabled;
-		}
-
-		public void setEnabled(boolean enabled) {
-			this.enabled = enabled;
-		}
-	}
 
 	@Override
 	public String toString() {
 		return "ConfigClientProperties [enabled=" + enabled + ", profile=" + profile
-				+ ", name=" + name + ", label=" + (label==null?"":label) + ", username=" + username
-				+ ", password=" + password + ", uri=" + uri + ", discovery.enabled="
-				+ discovery.enabled + ", failFast=" + failFast + "]";
+				+ ", name=" + name + ", label=" + (label == null ? "" : label)
+				+ ", username=" + username + ", password=" + password + ", uri=" + uri
+				+ ", discovery.enabled=" + discovery.enabled + ", failFast=" + failFast
+				+ "]";
 	}
 
 }