diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..73967c8
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,41 @@
+# Changelog
+
+## v0.1.1
+
+- Fix for annotations in grafana 5.x before 5.4
+
+## v0.1.0
+
+- Tested with Grafana 6.0.0
+- Tested with InfluxDB and Mysql datasources
+- Add initial support for display annotations
+- Add example for k8s statuses (thanks, @vrutkovs)
+- Fix hanging on big values
+- Fix horizontal spacing = 0
+- Fix for "Object doesn't support property or method 'remove'"
+- Fix card width for targets with different datapoints count
+
+## v0.0.4
+
+- Fix display of multivalues buckets as an empty cell
+
+## v0.0.3
+
+- Add solarized preset
+- Reorganize statuses editor for discrete mode
+- Separate options for vertical and horizontal spacing for cards
+- Add simple sort options for Y axis
+- Fix display null values as zero
+
+## v0.0.2
+
+- Install with GF_INSTALL_PLUGINS
+- Fix legend overlap
+- Fix colors for dark theme
+- Fix panel rendering timeout error
+
+
+## v0.0.1
+
+- First public release
+
diff --git a/Gruntfile.js b/Gruntfile.js
index 37d9a5a..17fe576 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,7 +27,7 @@ module.exports = (grunt) => {
       },
       pluginDef: {
         expand: true,
-        src: ['plugin.json', 'README.md'],
+        src: ['plugin.json', 'README.md', 'CHANGELOG.md'],
         dest: 'dist'
       }
     },
diff --git a/README.md b/README.md
index 4d34de9..6ee8b17 100644
--- a/README.md
+++ b/README.md
@@ -203,39 +203,7 @@ The first public release of this plugin has been fully made by [Flant](https://f
 
 This plugin is based on "Heatmap" panel by Grafana and partly inspired by ideas from Carpet plot, Discrete panel, Status Panel, Status Dot, Status By Group.
 
-#### Changelog
 
-##### v0.1.0
+### CHANGELOG
 
-- Tested with Grafana 6.0.0
-- Tested with InfluxDB and Mysql datasources
-- Add initial support for display annotations
-- Add example for k8s statuses (thanks, @vrutkovs)
-- Fix hanging on big values
-- Fix horizontal spacing = 0
-- Fix for "Object doesn't support property or method 'remove'"
-- Fix card width for targets with different datapoints count
-
-##### v0.0.4
-
-- Fix display of multivalues buckets as an empty cell
-
-##### v0.0.3
-
-- Add solarized preset
-- Reorganize statuses editor for discrete mode
-- Separate options for vertical and horizontal spacing for cards
-- Add simple sort options for Y axis
-- Fix display null values as zero
-
-##### v0.0.2
-
-- Install with GF_INSTALL_PLUGINS
-- Fix legend overlap
-- Fix colors for dark theme
-- Fix panel rendering timeout error
-
-
-##### v0.0.1
-
-- First public release
+The latest changes can be found here: [CHANGELOG.md](https://github.com/flant/grafana-statusmap/blob/master/CHANGELOG.md)
diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md
new file mode 100644
index 0000000..73967c8
--- /dev/null
+++ b/dist/CHANGELOG.md
@@ -0,0 +1,41 @@
+# Changelog
+
+## v0.1.1
+
+- Fix for annotations in grafana 5.x before 5.4
+
+## v0.1.0
+
+- Tested with Grafana 6.0.0
+- Tested with InfluxDB and Mysql datasources
+- Add initial support for display annotations
+- Add example for k8s statuses (thanks, @vrutkovs)
+- Fix hanging on big values
+- Fix horizontal spacing = 0
+- Fix for "Object doesn't support property or method 'remove'"
+- Fix card width for targets with different datapoints count
+
+## v0.0.4
+
+- Fix display of multivalues buckets as an empty cell
+
+## v0.0.3
+
+- Add solarized preset
+- Reorganize statuses editor for discrete mode
+- Separate options for vertical and horizontal spacing for cards
+- Add simple sort options for Y axis
+- Fix display null values as zero
+
+## v0.0.2
+
+- Install with GF_INSTALL_PLUGINS
+- Fix legend overlap
+- Fix colors for dark theme
+- Fix panel rendering timeout error
+
+
+## v0.0.1
+
+- First public release
+
diff --git a/dist/README.md b/dist/README.md
index 4d34de9..6ee8b17 100644
--- a/dist/README.md
+++ b/dist/README.md
@@ -203,39 +203,7 @@ The first public release of this plugin has been fully made by [Flant](https://f
 
 This plugin is based on "Heatmap" panel by Grafana and partly inspired by ideas from Carpet plot, Discrete panel, Status Panel, Status Dot, Status By Group.
 
-#### Changelog
 
-##### v0.1.0
+### CHANGELOG
 
-- Tested with Grafana 6.0.0
-- Tested with InfluxDB and Mysql datasources
-- Add initial support for display annotations
-- Add example for k8s statuses (thanks, @vrutkovs)
-- Fix hanging on big values
-- Fix horizontal spacing = 0
-- Fix for "Object doesn't support property or method 'remove'"
-- Fix card width for targets with different datapoints count
-
-##### v0.0.4
-
-- Fix display of multivalues buckets as an empty cell
-
-##### v0.0.3
-
-- Add solarized preset
-- Reorganize statuses editor for discrete mode
-- Separate options for vertical and horizontal spacing for cards
-- Add simple sort options for Y axis
-- Fix display null values as zero
-
-##### v0.0.2
-
-- Install with GF_INSTALL_PLUGINS
-- Fix legend overlap
-- Fix colors for dark theme
-- Fix panel rendering timeout error
-
-
-##### v0.0.1
-
-- First public release
+The latest changes can be found here: [CHANGELOG.md](https://github.com/flant/grafana-statusmap/blob/master/CHANGELOG.md)