diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd2da532ffff..34f33c64fa69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,18 @@
## [`master`](https://github.com/elastic/eui/tree/master)
-No public interface changes since `0.0.49`.
+**Bug fixes**
+
+- `EuiButton`, `EuiButtonEmpty`, and `EuiButtonIcon` now look and behave disabled when `isDisabled={true}` ([#862](https://github.com/elastic/eui/pull/862))
## [`0.0.49`](https://github.com/elastic/eui/tree/v0.0.49)
**Breaking changes**
+
- EUI requires React `16.3` or higher ([#849](https://github.com/elastic/eui/pull/849))
- `EuiHeaderBreadcrumbs` refactored to use `EuiBreadcrumbs`. This removed all child components of `EuiHeaderBreadcrumbs`. ([#844](https://github.com/elastic/eui/pull/844))
**Bug fixes**
+
- `EuiInMemoryTable` now applies its search filter ([#851](https://github.com/elastic/eui/pull/851))
- `EuiInMemoryTable` and `EuiBasicTable` now pass unknown props through to their child ([#836](https://github.com/elastic/eui/pull/836))
- Added `EuiHeaderLinks` which allow you to construct navigation in the header in place of the app menu. ([#844](https://github.com/elastic/eui/pull/844))
diff --git a/src-docs/src/views/button/button_as_link.js b/src-docs/src/views/button/button_as_link.js
index 1b523936f21e..fce37cf063f7 100644
--- a/src-docs/src/views/button/button_as_link.js
+++ b/src-docs/src/views/button/button_as_link.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
import {
EuiButton,
@@ -9,20 +9,41 @@ import {
} from '../../../../src/components';
export default () => (
-
-
-
- Link to elastic.co
-
-
+
+
+
+
+ Link to elastic.co
+
+
-
-
- Link to elastic.co
-
-
-
-
-
-
+
+
+ Link to elastic.co
+
+
+
+
+
+
+
+
+
+
+
+ Disabled link
+
+
+
+
+
+ Disabled empty link
+
+
+
+
+
+
+
+
);
diff --git a/src/components/button/__snapshots__/button.test.js.snap b/src/components/button/__snapshots__/button.test.js.snap
index ee3804c9c2b3..bed2854e7847 100644
--- a/src/components/button/__snapshots__/button.test.js.snap
+++ b/src/components/button/__snapshots__/button.test.js.snap
@@ -248,6 +248,22 @@ exports[`EuiButton props isDisabled is rendered 1`] = `
`;
+exports[`EuiButton props isDisabled renders a button even when href is defined 1`] = `
+
+`;
+
exports[`EuiButton props isLoading is rendered 1`] = `
`;
+exports[`EuiButtonEmpty props isDisabled renders a button even when href is defined 1`] = `
+
+`;
+
exports[`EuiButtonEmpty props size l is rendered 1`] = `