diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5150ec4..45fd2c87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+
+## [v2.1.1](https://github.com/test-kitchen/kitchen-openstack/tree/v2.1.1) (2015-11-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v2.1.0...v2.1.1)
+
+**Closed issues:**
+
+- kitchen create on Windows 2012/WinRM fails: "Expressions are only allowed as the first element of a pipeline." [\#122](https://github.com/test-kitchen/kitchen-openstack/issues/122)
+
+**Merged pull requests:**
+
+- Ohai hint file is now created with the correct encoding on Windows [\#124](https://github.com/test-kitchen/kitchen-openstack/pull/124) ([stuartpreston](https://github.com/stuartpreston))
+- Added info about user\_data [\#121](https://github.com/test-kitchen/kitchen-openstack/pull/121) ([jjasghar](https://github.com/jjasghar))
+
 ## [v2.1.0](https://github.com/test-kitchen/kitchen-openstack/tree/v2.1.0) (2015-10-19)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v2.1.0.pre.1...v2.1.0)
 
@@ -389,4 +402,4 @@
 ## [v0.5.1](https://github.com/test-kitchen/kitchen-openstack/tree/v0.5.1) (2011-04-05)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/lib/kitchen/driver/openstack_version.rb b/lib/kitchen/driver/openstack_version.rb
index 6c3597fb..56067deb 100644
--- a/lib/kitchen/driver/openstack_version.rb
+++ b/lib/kitchen/driver/openstack_version.rb
@@ -22,6 +22,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '2.1.0'
+    OPENSTACK_VERSION = '2.1.1'
   end
 end