diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..618b18c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,28 @@
+# Change Log
+
+## [0.3.0](https://github.com/dev-sec/linux-patch-baseline/tree/0.3.0) (2017-05-08)
+[Full Changelog](https://github.com/dev-sec/linux-patch-baseline/compare/0.2.0...0.3.0)
+
+**Merged pull requests:**
+
+- restrict ruby testing to version 2.3.3 and update gemfile [\#8](https://github.com/dev-sec/linux-patch-baseline/pull/8) ([atomic111](https://github.com/atomic111))
+- add contribution guidelines [\#7](https://github.com/dev-sec/linux-patch-baseline/pull/7) ([chris-rock](https://github.com/chris-rock))
+- only run detailed patch control if patches are available [\#6](https://github.com/dev-sec/linux-patch-baseline/pull/6) ([chris-rock](https://github.com/chris-rock))
+- improve code style [\#5](https://github.com/dev-sec/linux-patch-baseline/pull/5) ([chris-rock](https://github.com/chris-rock))
+
+## [0.2.0](https://github.com/dev-sec/linux-patch-baseline/tree/0.2.0) (2017-03-01)
+[Full Changelog](https://github.com/dev-sec/linux-patch-baseline/compare/0.1.0...0.2.0)
+
+**Fixed bugs:**
+
+- nil exception on scanning CentOS 7.2 [\#3](https://github.com/dev-sec/linux-patch-baseline/issues/3)
+
+**Merged pull requests:**
+
+- fix \#3 [\#4](https://github.com/dev-sec/linux-patch-baseline/pull/4) ([chris-rock](https://github.com/chris-rock))
+- add basic test-kitchen config [\#1](https://github.com/dev-sec/linux-patch-baseline/pull/1) ([chris-rock](https://github.com/chris-rock))
+
+## [0.1.0](https://github.com/dev-sec/linux-patch-baseline/tree/0.1.0) (2016-09-27)
+
+
+\* *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 ced9718..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,10 +26,13 @@ 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
diff --git a/inspec.yml b/inspec.yml
index 5f48288..722dfc8 100644
--- a/inspec.yml
+++ b/inspec.yml
@@ -1,7 +1,7 @@
-name: linux-patch-benchmark
+name: linux-patch-baseline
 title: DevSec Linux Patch Benchmark
 summary: Verifies that all patches have been applied
-version: 0.2.0
+version: 0.3.0
 
 maintainer: Christoph Hartmann
 copyright: Christoph Hartmann