diff --git a/README.md b/README.md
index caadacd6..d119fe94 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ response = HTTPX.get("https://nghttp2.org")
 puts response.status #=> 200
 body = response.body
 puts body #=> #<HTTPX::Response ...
-``` 
+```
 
 You can also send as many requests as you want simultaneously:
 
@@ -79,7 +79,7 @@ In Ruby, HTTP client implementations are a known cheap commodity. Why this one?
 
 ### Concurrency
 
-This library supports HTTP/2 seamlessly (which means, if the request is secure, and the server support ALPN negotiation AND HTTP/2, the request will be made through HTTP/2). If you pass multiple URIs, and they can utilize the same connection, they will run concurrently in it. 
+This library supports HTTP/2 seamlessly (which means, if the request is secure, and the server support ALPN negotiation AND HTTP/2, the request will be made through HTTP/2). If you pass multiple URIs, and they can utilize the same connection, they will run concurrently in it.
 
 However if the server supports HTTP/1.1, it will try to use HTTP pipelining, falling back to 1 request at a time if the server doesn't support it (if the server support Keep-Alive connections, it will reuse the same connection).
 
@@ -137,7 +137,8 @@ In order to use HTTP/2 under JRuby, [check this link](https://gitlab.com/honeyry
 
 ### Known bugs
 
-Doesn't work with ruby 2.4.0 for Windows (see [#36](https://gitlab.com/honeyryderchuck/httpx/issues/36)).
+* Doesn't work with ruby 2.4.0 for Windows (see [#36](https://gitlab.com/honeyryderchuck/httpx/issues/36)).
+* Using `total_timeout` along with the `:persistent` plugin [does not work as you might expect](https://gitlab.com/honeyryderchuck/httpx/-/wikis/Timeouts#total_timeout).
 
 ## Contributing
 
diff --git a/doc/release_notes/0_18_2.md b/doc/release_notes/0_18_2.md
new file mode 100644
index 00000000..ca6828b8
--- /dev/null
+++ b/doc/release_notes/0_18_2.md
@@ -0,0 +1,10 @@
+# 0.18.2
+
+## Bugfixes
+
+* A bug was reported and fixed, whereby a persistent connection with a `:total_timeout` set was triggering the timeout and leaving the process looping indefinitely.
+
+
+## Chore
+
+The quirk of using the `:persistent` plugin with `:total_timeout` has been documented: https://gitlab.com/honeyryderchuck/httpx/-/wikis/Timeouts#total_timeout.
\ No newline at end of file
diff --git a/lib/httpx/version.rb b/lib/httpx/version.rb
index e896452d..346099a5 100644
--- a/lib/httpx/version.rb
+++ b/lib/httpx/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.18.1"
+  VERSION = "0.18.2"
 end
diff --git a/www/_data/versions.yml b/www/_data/versions.yml
index 4d2cea74..8285e071 100644
--- a/www/_data/versions.yml
+++ b/www/_data/versions.yml
@@ -1,4 +1,10 @@
 -
+  -
+    name: "0.18.2"
+    path: "0_18_2_md.html"
+  -
+    name: "0.18.1"
+    path: "0_18_1_md.html"
   -
     name: "0.18.0"
     path: "0_18_0_md.html"