diff --git a/docs/streams/upgrade-guide.html b/docs/streams/upgrade-guide.html
index 7db13341845..11c3a7eb17d 100644
--- a/docs/streams/upgrade-guide.html
+++ b/docs/streams/upgrade-guide.html
@@ -34,7 +34,9 @@
     </div>
 
     <p>
-        If you want to upgrade from 1.0.x to 1.1.0 you don't need to make any code changes as the public API is fully backward compatible.
+        If you are using Java 7 and want to upgrade from 1.0.x to 1.1.0 you don't need to make any code changes as the public API is fully backward compatible.
+        If you are using Java 8 method references in your Kafka Streams code you might need to update your code to resolve method ambiguties.
+	Hot-swaping the jar-file only might not work for this case.
         See <a href="#streams_api_changes_110">below</a> for a complete list of 1.1.0 API and semantic changes that allow you to advance your application and/or simplify your code base.
     </p>
 
diff --git a/docs/upgrade.html b/docs/upgrade.html
index 69e0e7cd916..02acdff5562 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -59,6 +59,8 @@
         with the new protocol by default.</li>
     <li>Bumping the protocol version and restarting can be done any time after the brokers are upgraded. It does not have to be immediately after.
         Similarly for the message format version.</li>
+    <li>If you are using Java8 method references in your Kafka Streams code you might need to update your code to resolve method ambiguties.
+        Hot-swaping the jar-file only might not work.</li>
 </ol>
 
 <h5><a id="upgrade_110_notable" href="#upgrade_110_notable">Notable changes in 1.1.0</a></h5>