diff --git a/.travis.yml b/.travis.yml
index 54a6b8198..d6e934feb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ services:
   - docker
 
 go:
-  - "1.10"
+  - "1.9"
 
 matrix:
   allow_failures:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41867783e..24392bd08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,14 @@ IMPROVEMENTS:
 
  * auth: Allow sending default_lease_ttl and max_lease_ttl values when enabling
    auth methods. [GH-4019]
+ * secret/database: Add list functionality to `database/config` endpoint
+   [GH-4026]
 
 BUG FIXES:
 
- * auth/aws: Switch libraries to fix regression verifying PKCS#7 identity
+ * listener: Revert to Go 1.9 for now to allow certificates with non-DNS names
+   in their DNS SANs to be used for Vault's TLS connections [GH-4028]
+ * auth/aws: Update libraries to fix regression verifying PKCS#7 identity
    documents [GH-4014]
 
 ## 0.9.4 (February 20th, 2018)
diff --git a/README.md b/README.md
index 3c50e6c33..d3fa4a931 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Developing Vault
 --------------------
 
 If you wish to work on Vault itself or any of its built-in systems, you'll
-first need [Go](https://www.golang.org) installed on your machine (version 1.10+
+first need [Go](https://www.golang.org) installed on your machine (version 1.9+
 is *required*).
 
 For local dev first make sure Go is properly installed, including setting up a