diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
new file mode 100644
index 0000000..389f911
--- /dev/null
+++ b/.chglog/CHANGELOG.tpl.md
@@ -0,0 +1,51 @@
+{{ if .Versions -}}
+<a name="unreleased"></a>
+## [Unreleased]
+{{ if .Unreleased.CommitGroups -}}
+{{ range .Unreleased.CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+{{ else }}
+{{ range .Unreleased.Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+
+{{ range .Versions }}
+<a name="{{ .Tag.Name }}"></a>
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+{{ if .CommitGroups -}}
+{{ range .CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+{{ else }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{- if .Versions }}
+[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
+{{ range .Versions -}}
+{{ if .Tag.Previous -}}
+[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
\ No newline at end of file
diff --git a/.chglog/config.yml b/.chglog/config.yml
new file mode 100644
index 0000000..7522b76
--- /dev/null
+++ b/.chglog/config.yml
@@ -0,0 +1,10 @@
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/terraform-community-modules/tf_aws_elasticsearch
+options:
+  header:
+    pattern: "^(.*)$"
+    pattern_maps:
+      - Subject
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e182c96
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,103 @@
+<a name="unreleased"></a>
+## [Unreleased]
+
+
+
+<a name="v0.6.0"></a>
+## [v0.6.0] - 2019-01-31
+
+- Merge pull request [#18](https://github.com/segmentio/terraform-docs/issues/18) from yo61/small_cluster_dedicated_masters
+- Optionally set threshold for dedicated master nodes
+
+
+<a name="v0.5.0"></a>
+## [v0.5.0] - 2019-01-08
+
+- Updated pre-commit hooks
+- Merge pull request [#17](https://github.com/segmentio/terraform-docs/issues/17) from yo61/make_prefix_optional
+- Make prefix optional
+
+
+<a name="v0.4.0"></a>
+## [v0.4.0] - 2018-10-06
+
+- Updated styles
+- Merge pull request [#12](https://github.com/segmentio/terraform-docs/issues/12) from Agrium/DO-506/use-cms-key
+- DO-506: Passed in kms key
+
+
+<a name="v0.3.0"></a>
+## [v0.3.0] - 2018-08-19
+
+- Merge pull request [#9](https://github.com/segmentio/terraform-docs/issues/9) from dannybrody/master
+- adding option to have encryption at rest inside a vpc
+
+
+<a name="v0.2.0"></a>
+## [v0.2.0] - 2018-08-19
+
+- Added pre-commit hooks
+- Merge pull request [#11](https://github.com/segmentio/terraform-docs/issues/11) from perryao/master
+- add variable for setting tags
+
+
+<a name="v0.1.0"></a>
+## [v0.1.0] - 2018-01-05
+
+- docs: updating README to add new author
+- VPC support ([#5](https://github.com/segmentio/terraform-docs/issues/5))
+- Merge pull request [#3](https://github.com/segmentio/terraform-docs/issues/3) from kamilboratynski/bugfix/documentation
+- Fixed description for `instance_count` variable
+
+
+<a name="0.0.2"></a>
+## [0.0.2] - 2017-05-30
+
+- updating README for new release
+- Merge pull request [#1](https://github.com/segmentio/terraform-docs/issues/1) from terraform-community-modules/strtobool_error
+- undid two inadvertent changes
+- fixing string that can't be parsed as boolean
+- wrote README, ready for release
+- add management_iam_roles parameter
+- explicitly add all AWS principals
+- more conditional magic to try to reduce churn
+- argh, dependency cycle
+- additional access control rule
+- don't make a separate access_policies resource
+- wrote some outputs
+- typo fix
+- attach access policies to es domain
+- typo fix, wrong variable name
+- first try at elasticsearch module
+- building Elasticsearch domain
+- initial commit
+- Initial commit
+
+
+<a name="0.0.1"></a>
+## 0.0.1 - 2017-05-19
+
+- wrote README, ready for release
+- add management_iam_roles parameter
+- explicitly add all AWS principals
+- more conditional magic to try to reduce churn
+- argh, dependency cycle
+- additional access control rule
+- don't make a separate access_policies resource
+- wrote some outputs
+- typo fix
+- attach access policies to es domain
+- typo fix, wrong variable name
+- first try at elasticsearch module
+- building Elasticsearch domain
+- initial commit
+
+
+[Unreleased]: https://github.com/segmentio/terraform-docs/compare/v0.6.0...HEAD
+[v0.6.0]: https://github.com/segmentio/terraform-docs/compare/v0.5.0...v0.6.0
+[v0.5.0]: https://github.com/segmentio/terraform-docs/compare/v0.4.0...v0.5.0
+[v0.4.0]: https://github.com/segmentio/terraform-docs/compare/v0.3.0...v0.4.0
+[v0.3.0]: https://github.com/segmentio/terraform-docs/compare/v0.2.0...v0.3.0
+[v0.2.0]: https://github.com/segmentio/terraform-docs/compare/v0.1.0...v0.2.0
+[v0.1.0]: https://github.com/segmentio/terraform-docs/compare/0.0.2...v0.1.0
+[0.0.2]: https://github.com/segmentio/terraform-docs/compare/0.0.1...0.0.2
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1cc0aa4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,3 @@
+.PHONY: changelog
+changelog:
+	git-chglog -o CHANGELOG.md
\ No newline at end of file