diff --git a/ChangeLog b/ChangeLog
index 68166039..05d0a2a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
 
+* Version 2.0.12
+ - Further compatibility fixes for Alpine Linux/i386 and Android/i386
+have been made. Thanks to @aead for his help!
+ - The proxy will now wait for network connectivity before starting.
+This is useful if the proxy is automatically started at boot, possibly
+before the network is fully configured.
+ - The IPv6 blocking module now returns synthetic SOA records to
+improve compatibility with downstream resolvers and stub resolvers.
+
 * Version 2.0.11
  - This release fixes a long-standing bug that caused the proxy to
 block or crash when Position-Independent Executables were produced.
diff --git a/README.md b/README.md
index 528c5207..f9f152cc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 A flexible DNS proxy, with support for modern encrypted DNS protocols such as [DNSCrypt v2](https://dnscrypt.info/protocol) and [DNS-over-HTTP](https://tools.ietf.org/html/draft-ietf-doh-dns-over-https-05).
 
-## [dnscrypt-proxy 2.0.11 final is available for download!](https://github.com/jedisct1/dnscrypt-proxy/releases/latest)
+## [dnscrypt-proxy 2.0.12 final is available for download!](https://github.com/jedisct1/dnscrypt-proxy/releases/latest)
 
 * [dnscrypt-proxy documentation](https://dnscrypt.info/doc) – This project's documentation (Wiki)
 * [DNSCrypt project home page](https://dnscrypt.info/)
diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
index 86be6cc9..c71eaf2d 100644
--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
@@ -163,8 +163,8 @@ fallback_resolver = '9.9.9.9:53'
 ignore_system_dns = false
 
 
-## Maximum time (in seconds) to wait for network connectivity when the proxy starts.
-## Useful if the proxy is automatically started at boot, and network connectivity is not immediately available.
+## Maximum time (in seconds) to wait for network connectivity before initializing the proxy.
+## Useful if the proxy is automatically started at boot, and network connectivity is not guaranteed to be immediately available.
 ## Use 0 to disable.
 
 netprobe_timeout = 30
diff --git a/dnscrypt-proxy/main.go b/dnscrypt-proxy/main.go
index a9a54eca..998ab124 100644
--- a/dnscrypt-proxy/main.go
+++ b/dnscrypt-proxy/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	AppVersion            = "2.0.11"
+	AppVersion            = "2.0.12"
 	DefaultConfigFileName = "dnscrypt-proxy.toml"
 )