diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac18df46..cfa39e14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,79 @@
-
-TODO: This document was neglected and is currently not complete. Working on
-fixing this.
+TODO: This document was manually maintained so might be incomplete. The
+automation effort is tracked in
+https://github.com/kubernetes/client-go/issues/234.
 
 # HEAD (changes that will go into the next release)
 
+# v4.0.0-beta.0
+
+**New features:**
+
+* Added OpenAPISchema support in the discovery client
+
+    * [https://github.com/kubernetes/kubernetes/pull/44531](https://github.com/kubernetes/kubernetes/pull/44531)
+
+* Added mutation cache filter: MutationCache is able to take the result of update operations and stores them in an LRU that can be used to provide a more current view of a requested object.
+
+    * [https://github.com/kubernetes/kubernetes/pull/45838](https://github.com/kubernetes/kubernetes/pull/45838/commits/f88c7725b4f9446c652d160bdcfab7c6201bddea)
+
+* Moved the remotecommand package (used by `kubectl exec/attach`) to client-go
+
+    * [https://github.com/kubernetes/kubernetes/pull/41331](https://github.com/kubernetes/kubernetes/pull/41331)
+
+* Added support for following redirects to the SpdyRoundTripper
+
+    * [https://github.com/kubernetes/kubernetes/pull/44451](https://github.com/kubernetes/kubernetes/pull/44451)
+
+* Added Azure Active Directory plugin
+
+    * [https://github.com/kubernetes/kubernetes/pull/43987](https://github.com/kubernetes/kubernetes/pull/43987)
+
+**Usability improvements:**
+
+* Added several new examples and reorganized client-go/examples
+
+    * [Related PRs](https://github.com/kubernetes/kubernetes/commits/release-1.7/staging/src/k8s.io/client-go/examples)
+
+**API changes:**
+
+* Added networking.k8s.io/v1 API
+
+    * [https://github.com/kubernetes/kubernetes/pull/39164](https://github.com/kubernetes/kubernetes/pull/39164)
+
+* ControllerRevision type added for StatefulSet and DaemonSet history.
+
+    * [https://github.com/kubernetes/kubernetes/pull/45867](https://github.com/kubernetes/kubernetes/pull/45867)
+
+* Added support for initializers
+
+    * [https://github.com/kubernetes/kubernetes/pull/38058](https://github.com/kubernetes/kubernetes/pull/38058)
+
+* Added admissionregistration.k8s.io/v1alpha1 API
+
+    * [https://github.com/kubernetes/kubernetes/pull/46294](https://github.com/kubernetes/kubernetes/pull/46294)
+
+**Breaking changes:**
+
+* Moved client-go/util/clock to apimachinery/pkg/util/clock 
+
+    * [https://github.com/kubernetes/kubernetes/pull/45933](https://github.com/kubernetes/kubernetes/pull/45933/commits/8013212db54e95050c622675c6706cce5de42b45)
+
+* Some [API helpers](https://github.com/kubernetes/client-go/blob/release-3.0/pkg/api/helpers.go) were removed. 
+
+* Dynamic client takes GetOptions as an input parameter
+
+    * [https://github.com/kubernetes/kubernetes/pull/47251](https://github.com/kubernetes/kubernetes/pull/47251)
+
+**Bug fixes:**
+
+* PortForwarder: don't log an error if net.Listen fails. [https://github.com/kubernetes/kubernetes/pull/44636](https://github.com/kubernetes/kubernetes/pull/44636)
+
+* oidc auth plugin not to override the Auth header if it's already exits. [https://github.com/kubernetes/kubernetes/pull/45529](https://github.com/kubernetes/kubernetes/pull/45529)
+
+* The --namespace flag is now honored for in-cluster clients that have an empty configuration. [https://github.com/kubernetes/kubernetes/pull/46299](https://github.com/kubernetes/kubernetes/pull/46299)
+
+* GCP auth plugin no longer overwrites existing Authorization headers. [https://github.com/kubernetes/kubernetes/pull/45575](https://github.com/kubernetes/kubernetes/pull/45575)
+
 # v3.0.0
 
 Bug fixes:
@@ -26,6 +96,8 @@ Bug fixes:
   * Changed client support for:
     * certificates from v1alpha1 to v1beta1
     * policy from v1alpha1 to v1beta1
+  * Deleted client support for:
+    * extensions/v1beta1#Job
 * CHANGED: pass typed options to dynamic client (https://github.com/kubernetes/kubernetes/pull/41887)
 
 # v2.0.0
diff --git a/README.md b/README.md
index b1e2c68a..1d7f7ccd 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Go clients for talking to a [kubernetes](http://kubernetes.io/) cluster.
 
-We currently recommend using the v2.0.0 tag. See [INSTALL.md](/INSTALL.md) for
+We currently recommend using the v3.0.0 tag. See [INSTALL.md](/INSTALL.md) for
 detailed installation instructions. `go get k8s.io/client-go/...` works, but
 will give you head and doesn't handle the dependencies well.
 
@@ -85,8 +85,9 @@ We will backport bugfixes--but not new features--into older versions of
 | client-go 1.4       | +              | ✓              | -              | -              | -              |
 | client-go 1.5       | +              | +              | -              | -              | -              |
 | client-go 2.0       | +              | +              | ✓              | -              | -              |
-| client-go 3.0       | †              | +              | +              | ✓              | -              |
-| client-go HEAD      | †              | †              | +              | +              | +              |
+| client-go 3.0       | †              | †              | †              | ✓              | -              |
+| client-go 4.0.beta.0| †              | †              | †              | +              | ✓              |
+| client-go HEAD      | †              | †              | †              | +              | +              |
 
 Key: