diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72a1053..defd231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
-# Changelog
+# Change Log
 
-## 1.0.0
+## [2.0.0](https://github.com/dev-sec/postgres-baseline/tree/2.0.0) (2017-01-05)
+[Full Changelog](https://github.com/dev-sec/postgres-baseline/compare/1.1.0...2.0.0)
 
-* initial release with Deutsche Telekom compliance requirements
+**Merged pull requests:**
+
+- Migrate to InSpec [\#13](https://github.com/dev-sec/postgres-baseline/pull/13) ([atomic111](https://github.com/atomic111))
+
+## [1.1.0](https://github.com/dev-sec/postgres-baseline/tree/1.1.0) (2015-10-15)
+[Full Changelog](https://github.com/dev-sec/postgres-baseline/compare/1.0.0...1.1.0)
+
+**Merged pull requests:**
+
+- adapt to latest robocop style [\#12](https://github.com/dev-sec/postgres-baseline/pull/12) ([chris-rock](https://github.com/chris-rock))
+- update urls [\#11](https://github.com/dev-sec/postgres-baseline/pull/11) ([chris-rock](https://github.com/chris-rock))
+- add json format option [\#10](https://github.com/dev-sec/postgres-baseline/pull/10) ([atomic111](https://github.com/atomic111))
+- Update common [\#9](https://github.com/dev-sec/postgres-baseline/pull/9) ([arlimus](https://github.com/arlimus))
+- update to serverspec2 [\#8](https://github.com/dev-sec/postgres-baseline/pull/8) ([ehaselwanter](https://github.com/ehaselwanter))
+- Update common [\#7](https://github.com/dev-sec/postgres-baseline/pull/7) ([arlimus](https://github.com/arlimus))
+- updating common files [\#6](https://github.com/dev-sec/postgres-baseline/pull/6) ([arlimus](https://github.com/arlimus))
+- install server and apply hardening in seperate steps [\#5](https://github.com/dev-sec/postgres-baseline/pull/5) ([chris-rock](https://github.com/chris-rock))
+- bugfix: lint error [\#4](https://github.com/dev-sec/postgres-baseline/pull/4) ([chris-rock](https://github.com/chris-rock))
+- add ssl test back in for 'off' setting [\#3](https://github.com/dev-sec/postgres-baseline/pull/3) ([ehaselwanter](https://github.com/ehaselwanter))
+
+## [1.0.0](https://github.com/dev-sec/postgres-baseline/tree/1.0.0) (2014-08-13)
+**Merged pull requests:**
+
+- version 0.9 of tests, disabled ssl check for now as it requires more work on chef and puppet with redhat derivates [\#2](https://github.com/dev-sec/postgres-baseline/pull/2) ([ehaselwanter](https://github.com/ehaselwanter))
+- first pass of postgres hardening requirement tests [\#1](https://github.com/dev-sec/postgres-baseline/pull/1) ([ehaselwanter](https://github.com/ehaselwanter))
+
+
+
+\* *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/README.md b/README.md
index fd1dece..a45c2b0 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,43 @@
-tests-postgres-hardening
-=====================
+DevSec PostgreSQL Baseline
+==========================
 
-This are the integration tests for the projects
+This Compliance Profile ensures, that all hardening projects keep the same quality.
 
-- https://github.com/hardening-io/puppet-postgres-hardening
-- https://github.com/hardening-io/chef-postgres-hardening
-
-they start at `integration` level
-
-you can use the gem `kitchen-sharedtests`
-
-- https://github.com/ehaselwanter/kitchen-sharedtests/
-
-to make them available to your project. Use `thor kitchen:fetch-remote-tests` to put the repo into `test/integration`
+- https://github.com/dev-sec/chef-postgres-hardening
+- https://github.com/dev-sec/puppet-postgres-hardening
 
 ## Standalone Usage
 
-you can target the integration tests to any host were you have ssh access
-
-rake -T gives you a list of suites you can run (well ignore directories which are obviously not suites for now)
+This Compliance Profile requires [InSpec](https://github.com/chef/inspec) for execution:
 
 ```
-± rake -T
-rake serverspec:default    # Run serverspec suite default
+$ git clone https://github.com/dev-sec/postgres-baseline
+$ inspec exec postgres-baseline
 ```
 
-run it with:
+You can also execute the profile directly from Github:
 
 ```
-bundle install
+$ inspec exec https://github.com/dev-sec/postgres-baseline
+```
 
-# default user and ssh-key
+## License and Author
 
-bundle exec rake serverspec:default target_host=<name-or-ip-of-target-server>
+* Author:: Patrick Muench <patrick.muench1111@gmail.com >
+* Author:: Dominik Richter <dominik.richter@googlemail.com>
+* Author:: Christoph Hartmann <chris@lollyrock.com>
+* Author:: Edmund Haselwanter <me@ehaselwanter.com>
 
-# or with user, host, password
+* Copyright 2014-2017, The Hardening Framework Team
 
-ASK_LOGIN_PASSWORD=true bundle exec rake serverspec:default target_host=192.168.1.222 user=stack
-```
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-add `format=html|json` to get a report.html or report.json document
+    http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.