diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45c0b57e2ca..efd4e95e173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
- Added support for range queries in `EuiSearchBar` (works for numeric and date values) ([#485](https://github.com/elastic/eui/pull/485))
- Add support for expandable rows to `EuiBasicTable` ([#585](https://github.com/elastic/eui/pull/585))
+**Bug fixes**
+- Fix font-weight issue in K6 theme ([#596](https://github.com/elastic/eui/pull/596))
+
# [`0.0.35`](https://github.com/elastic/eui/tree/v0.0.35)
- Modified `link` and all buttons to support both href and onClick ([#554](https://github.com/elastic/eui/pull/554))
diff --git a/docs/index.html b/docs/index.html
index da901faa343..5a2119cf789 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,7 +4,7 @@
-
+
diff --git a/src-docs/src/index.html b/src-docs/src/index.html
index fa82097e65f..513ef052283 100644
--- a/src-docs/src/index.html
+++ b/src-docs/src/index.html
@@ -4,7 +4,7 @@
-
+
diff --git a/src/global_styling/variables/_typography.scss b/src/global_styling/variables/_typography.scss
index 45369f2e461..72546c022aa 100644
--- a/src/global_styling/variables/_typography.scss
+++ b/src/global_styling/variables/_typography.scss
@@ -41,5 +41,5 @@ $euiLineHeight: 1.5;
$euiFontWeightLight: 300 !default;
$euiFontWeightRegular: 400 !default;
-$euiFontWeightMedium: 500 !default;
+$euiFontWeightMedium: 600 !default;
$euiFontWeightBold: 700 !default;
diff --git a/src/themes/k6/k6_globals.scss b/src/themes/k6/k6_globals.scss
index 5b6b9df09d7..e61c08a4107 100644
--- a/src/themes/k6/k6_globals.scss
+++ b/src/themes/k6/k6_globals.scss
@@ -11,4 +11,4 @@ $euiFontSizeXL: 24px;
$euiFontSizeXXL: 32px;
// Make titles bold.
-$euiFontWeightLight: 500;
+$euiFontWeightLight: 600;