diff --git a/docs/src/main/asciidoc/cloudformation.adoc b/docs/src/main/asciidoc/cloudformation.adoc
index 8753df0ee..4be285da7 100644
--- a/docs/src/main/asciidoc/cloudformation.adoc
+++ b/docs/src/main/asciidoc/cloudformation.adoc
@@ -15,6 +15,18 @@ template file and creates all resources with their _physical name_. The applicat
 with the _logical name_ defined in the template. Spring Cloud AWS resolves all _logical names_ into the respective
 _physical name_ for the application developer.
 
+=== Dependencies
+
+To enable CloudFormation support in Spring Cloud AWS you must add following dependency that will trigger `ContextStackAutoConfiguration`:
+
+[source,xml,indent=0]
+----
+<dependency>
+    <groupId>com.amazonaws</groupId>
+    <artifactId>aws-java-sdk-cloudformation</artifactId>
+</dependency>
+----
+
 === Automatic CloudFormation configuration
 If the application runs inside a stack (because the underlying EC2 instance has been bootstrapped within the stack), then
 Spring Cloud AWS will automatically detect the stack and resolve all resources from the stack. Application developers
diff --git a/spring-cloud-aws-autoconfigure/pom.xml b/spring-cloud-aws-autoconfigure/pom.xml
index d3c4fae3b..49677e594 100644
--- a/spring-cloud-aws-autoconfigure/pom.xml
+++ b/spring-cloud-aws-autoconfigure/pom.xml
@@ -87,6 +87,11 @@
 			<artifactId>aws-java-sdk-ses</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk-cloudformation</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-cloudwatch</artifactId>
diff --git a/spring-cloud-aws-context/pom.xml b/spring-cloud-aws-context/pom.xml
index 2a93905f4..224113c97 100644
--- a/spring-cloud-aws-context/pom.xml
+++ b/spring-cloud-aws-context/pom.xml
@@ -58,6 +58,11 @@
 			<artifactId>aws-java-sdk-elasticache</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk-cloudformation</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-ses</artifactId>
diff --git a/spring-cloud-aws-core/pom.xml b/spring-cloud-aws-core/pom.xml
index 30ed846e3..1b4c76cd0 100644
--- a/spring-cloud-aws-core/pom.xml
+++ b/spring-cloud-aws-core/pom.xml
@@ -53,6 +53,7 @@
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-cloudformation</artifactId>
+			<optional>true</optional>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-cloud-aws-integration-test/pom.xml b/spring-cloud-aws-integration-test/pom.xml
index 70d65234a..29f75c116 100644
--- a/spring-cloud-aws-integration-test/pom.xml
+++ b/spring-cloud-aws-integration-test/pom.xml
@@ -125,6 +125,11 @@
 			<artifactId>aws-java-sdk-elasticache</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk-cloudformation</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>elasticache-java-cluster-client</artifactId>