diff --git a/docs/src/main/asciidoc/info-contributor.adoc b/docs/src/main/asciidoc/info-contributor.adoc
new file mode 100644
index 00000000..073dfdca
--- /dev/null
+++ b/docs/src/main/asciidoc/info-contributor.adoc
@@ -0,0 +1,7 @@
+== Info Contributor
+
+Spring Cloud Kubernetes includes an `InfoContributor` which adds Pod information to
+Spring Boot's `/info` Acturator endpoint.
+
+You can disable this `InfoContributor` by setting `management.info.kubernetes.enabled`
+to `false` in `bootstrap.[properties | yaml]`.
diff --git a/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc b/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc
index 1b37fdfe..544eeb4f 100644
--- a/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc
@@ -19,6 +19,8 @@ include::kubernetes-awareness.adoc[]
 
 include::pod-health-indicator.adoc[]
 
+include::info-contributor.adoc[]
+
 include::leader-election.adoc[]
 
 include::load-balancer.adoc[]
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
index 8122c660..518df03d 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
+import org.springframework.boot.actuate.autoconfigure.info.ConditionalOnEnabledInfoContributor;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -146,6 +147,7 @@ public class Fabric8AutoConfiguration {
 		}
 
 		@Bean
+		@ConditionalOnEnabledInfoContributor("kubernetes")
 		public Fabric8InfoContributor kubernetesInfoContributor(PodUtils podUtils) {
 			return new Fabric8InfoContributor(podUtils);
 		}