diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..7db7e3c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Change Log
+
+## [0.4.0](https://github.com/dev-sec/windows-patch-baseline/tree/0.4.0) (2017-05-08)
+[Full Changelog](https://github.com/dev-sec/windows-patch-baseline/compare/0.3.1...0.4.0)
+
+**Merged pull requests:**
+
+- restrict ruby testing to version 2.3.3 [\#7](https://github.com/dev-sec/windows-patch-baseline/pull/7) ([atomic111](https://github.com/atomic111))
+- improve code style [\#6](https://github.com/dev-sec/windows-patch-baseline/pull/6) ([chris-rock](https://github.com/chris-rock))
+
+## [0.3.1](https://github.com/dev-sec/windows-patch-baseline/tree/0.3.1) (2017-03-01)
+[Full Changelog](https://github.com/dev-sec/windows-patch-baseline/compare/0.3.0...0.3.1)
+
+**Merged pull requests:**
+
+- return empty array, if the operating is not supported [\#3](https://github.com/dev-sec/windows-patch-baseline/pull/3) ([chris-rock](https://github.com/chris-rock))
+- trying to fix line 166 [\#2](https://github.com/dev-sec/windows-patch-baseline/pull/2) ([rojomisin](https://github.com/rojomisin))
+
+## [0.3.0](https://github.com/dev-sec/windows-patch-baseline/tree/0.3.0) (2016-09-08)
+[Full Changelog](https://github.com/dev-sec/windows-patch-baseline/compare/0.2.0...0.3.0)
+
+## [0.2.0](https://github.com/dev-sec/windows-patch-baseline/tree/0.2.0) (2016-08-23)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index ae863fe..ebf65df 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+# encoding: utf-8
 
 require 'rake/testtask'
 require 'rubocop/rake_task'
@@ -25,15 +26,16 @@ namespace :test do
 end
 
 # Automatically generate a changelog for this project. Only loaded if
-# the necessary gem is installed.
-# use `rake changelog to=1.2.0`
+# the necessary gem is installed. By default its picking up the version from
+# inspec.yml. You can override that behavior with `rake changelog to=1.2.0`
 begin
-  v = ENV['to']
+  require 'yaml'
+  metadata = YAML.load_file('inspec.yml')
+  v = ENV['to'] || metadata['version']
+  puts "Generate changelog for version #{v}"
   require 'github_changelog_generator/task'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.future_release = v
-    config.user = 'dev-sec'
-    config.project = 'windows-patch-baseline'
   end
 rescue LoadError
   puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
diff --git a/inspec.yml b/inspec.yml
index 508134a..41f1c4d 100644
--- a/inspec.yml
+++ b/inspec.yml
@@ -1,7 +1,7 @@
-name: windows-patch-benchmark
-title: DevSec Windows Patch Benchmark
+name: windows-patch-baseline
+title: DevSec Windows Patch Baseline
 summary: Verifies all patches are applied
-version: 0.3.1
+version: 0.4.0
 
 maintainer: Christoph Hartmann
 copyright: Christoph Hartmann