diff --git a/CHANGELOG.md b/CHANGELOG.md
index 573921cf1..5fc776ca8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.25.0](https://github.com/chef/inspec/tree/v1.25.0) (2017-05-17)
+[Full Changelog](https://github.com/chef/inspec/compare/v1.24.0...v1.25.0)
+
+**Implemented enhancements:**
+
+- return version as json [\#1822](https://github.com/chef/inspec/pull/1822) ([chris-rock](https://github.com/chris-rock))
+- support new automate compliance backend [\#1819](https://github.com/chef/inspec/pull/1819) ([chris-rock](https://github.com/chris-rock))
+
+**Fixed bugs:**
+
+- read source code if profile is in tgz/zip [\#1816](https://github.com/chef/inspec/pull/1816) ([arlimus](https://github.com/arlimus))
+- Update postgresql conf resource to accept include\_dir as a string as well as an array [\#1727](https://github.com/chef/inspec/pull/1727) ([elliott-davis](https://github.com/elliott-davis))
+
 ## [v1.24.0](https://github.com/chef/inspec/tree/v1.24.0) (2017-05-11)
 [Full Changelog](https://github.com/chef/inspec/compare/v1.23.0...v1.24.0)
 
@@ -13,7 +26,7 @@
 - Add support for Windows auth in mssql\_resourcet [\#1786](https://github.com/chef/inspec/pull/1786) ([arlimus](https://github.com/arlimus))
 - Allow mysql\_session to test databases on different hosts [\#1779](https://github.com/chef/inspec/pull/1779) ([aaronlippold](https://github.com/aaronlippold))
 - Handle parse errors for attrs/secrets [\#1775](https://github.com/chef/inspec/pull/1775) ([adamleff](https://github.com/adamleff))
-- Add an oracle\_session resource [\#1751](https://github.com/chef/inspec/pull/1751) ([nsdavidson](https://github.com/nsdavidson))
+- Add an oracledb\_session resource [\#1751](https://github.com/chef/inspec/pull/1751) ([nsdavidson](https://github.com/nsdavidson))
 
 ## [v1.23.0](https://github.com/chef/inspec/tree/v1.23.0) (2017-05-04)
 [Full Changelog](https://github.com/chef/inspec/compare/v1.22.0...v1.23.0)
diff --git a/lib/inspec/version.rb b/lib/inspec/version.rb
index c66714e31..8c6733569 100644
--- a/lib/inspec/version.rb
+++ b/lib/inspec/version.rb
@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '1.24.0'.freeze
+  VERSION = '1.25.0'.freeze
 end
diff --git a/www/Gemfile.lock b/www/Gemfile.lock
index 5d84aca05..77f81c043 100644
--- a/www/Gemfile.lock
+++ b/www/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/aleff/projects/inspec
   specs:
-    inspec (1.23.0)
+    inspec (1.25.0)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -182,22 +182,22 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.4.0)
     rouge (2.0.7)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     ruby-progressbar (1.8.1)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
@@ -232,7 +232,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.1.13)
       execjs (>= 0.3.0, < 3)
-    winrm (2.2.2)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)