diff --git a/.travis.yml b/.travis.yml
index 935821bc..f83979e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,12 @@ cache:
 matrix:
   include:
     - elixir: 1.9.4
-      # stick to OTP release 21.3 for now.
-      # We have problems with SSL and OTP 22
-      # https://github.com/kafkaex/kafka_ex/issues/389
-      otp_release: 21.3
+      otp_release: 22.3.3
       env: COVERALLS=true CREDO=true
     - elixir: 1.8.2
-      otp_release: 21.3
+      otp_release: 22.3.3
     - elixir: 1.7.4
-      otp_release: 21.3
+      otp_release: 22.3.3
     - elixir: 1.6.6
       otp_release: 20.3
     - elixir: 1.5.3
diff --git a/README.md b/README.md
index ed1654ab..c07ca018 100644
--- a/README.md
+++ b/README.md
@@ -82,8 +82,8 @@ For more information on using the Kayrock-based client, see
 
 *   Github: [kayrock.md](https://github.com/kafkaex/kafka_ex/blob/master/kayrock.md)
 *   HexDocs: [kayrock-based client](kayrock.html)
- 
-For more information on the v1.0 API, see 
+
+For more information on the v1.0 API, see
 
 *   Github:
     [new_api.md](https://github.com/kafkaex/kafka_ex/blob/master/new_api.md)
@@ -146,6 +146,18 @@ for a description of configuration variables, including the Kafka broker list
 
 You can also override options when creating a worker, see below.
 
+## Timeouts with SSL
+
+When using certain versions of OTP,
+[random timeouts can occur if using SSL](https://github.com/kafkaex/kafka_ex/issues/389).
+
+Impacted versions:
+
+*   OTP 21.3.8.1 -> 21.3.8.14
+*   OTP 22.1 -> 22.3.1
+
+Upgrade respectively to 21.3.8.15 or 22.3.2 to solve this.
+
 ## Usage Examples
 
 ### Consumer Groups