diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a1bee9..08e6067 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This file is used to list changes made in each version of openstack-chef-repo
 
+## 8.0.1:
+
+* Updating Berkshelf to 2.0.18 to fix bug #1338972
+
 ## 8.0.0:
 
 * Updating to Havana
diff --git a/Gemfile b/Gemfile
index c5115e8..45ba2c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,4 +4,4 @@ gem "chef", "~> 11.6.2"
 gem "json", "<= 1.7.7" # chef dependency
 gem "knife-block", "~> 0.0.6"
 gem "spiceweasel", "~> 2.6.0"
-gem "berkshelf", "~> 2.0.10"
+gem "berkshelf", "~> 2.0.18"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2957531..997e46e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.14)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
-    akami (1.2.0)
+    addressable (2.3.6)
+    akami (1.2.2)
       gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
-    berkshelf (2.0.10)
+      nokogiri
+    berkshelf (2.0.18)
       activesupport (~> 3.2.0)
       addressable (~> 2.3.4)
       buff-shell_out (~> 0.1)
       chozo (>= 0.6.1)
-      faraday (>= 0.8.5)
-      hashie (>= 2.0.2)
+      faraday (~> 0.8.5)
+      hashie (~> 2.0)
       minitar (~> 0.5.4)
       rbzip2 (~> 0.2.0)
       retryable (~> 1.3.3)
-      ridley (~> 1.5.0)
-      solve (>= 0.5.0)
+      ridley (~> 1.7.0)
+      solve (~> 0.8.2)
       thor (~> 0.18.0)
     buff-config (0.4.0)
       buff-extensions (~> 0.3)
       varia_model (~> 0.1)
     buff-extensions (0.5.0)
-    buff-ignore (1.1.0)
+    buff-ignore (1.1.1)
     buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.0)
+    buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
     builder (3.2.2)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
-    celluloid-io (0.14.1)
-      celluloid (>= 0.14.1)
-      nio4r (>= 0.4.5)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.1)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.0.0)
     chef (11.6.2)
       erubis (~> 2.7)
       highline (~> 1.6, >= 1.6.9)
@@ -54,28 +54,29 @@ GEM
       hashie (>= 2.0.2)
       multi_json (>= 1.3.0)
     erubis (2.7.0)
-    faraday (0.8.8)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    ffi (1.9.0)
+    ffi (1.9.6)
     gssapi (1.0.3)
       ffi (>= 1.0.1)
-    gyoku (1.1.0)
+    gyoku (1.2.2)
       builder (>= 2.1.2)
-    hashie (2.0.5)
+    hashie (2.1.2)
     highline (1.6.19)
-    httpclient (2.3.4.1)
+    hitimes (1.2.2)
+    httpclient (2.5.3.3)
     httpi (0.9.7)
       rack
-    i18n (0.6.5)
+    i18n (0.6.11)
     ipaddress (0.8.0)
     json (1.7.7)
     knife-block (0.0.9)
     little-plugger (1.1.3)
-    logging (1.8.1)
+    logging (1.8.2)
       little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
+      multi_json (>= 1.8.4)
     mime-types (1.25)
-    mini_portile (0.5.1)
+    mini_portile (0.6.1)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
@@ -83,18 +84,18 @@ GEM
     mixlib-config (1.1.2)
     mixlib-log (1.6.0)
     mixlib-shellout (1.2.0)
-    multi_json (1.8.1)
+    multi_json (1.10.1)
     multipart-post (1.2.0)
-    net-http-persistent (2.9)
-    net-ssh (2.7.0)
+    net-http-persistent (2.9.4)
+    net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.1)
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
-    nio4r (0.5.0)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
+    nio4r (1.0.1)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     nori (1.1.5)
     ohai (6.18.0)
       ipaddress
@@ -104,19 +105,19 @@ GEM
       mixlib-shellout
       systemu
       yajl-ruby
-    rack (1.5.2)
+    rack (1.6.0)
     rbzip2 (0.2.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    retryable (1.3.3)
-    ridley (1.5.3)
+    retryable (1.3.6)
+    ridley (1.7.1)
       addressable
       buff-config (~> 0.2)
       buff-extensions (~> 0.3)
       buff-ignore (~> 1.1)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.14.0)
-      celluloid-io (~> 0.14.0)
+      celluloid (~> 0.15)
+      celluloid-io (~> 0.15)
       erubis
       faraday (>= 0.8.4)
       hashie (>= 2.0.2)
@@ -124,7 +125,6 @@ GEM
       mixlib-authentication (>= 1.3.0)
       net-http-persistent (>= 2.8)
       net-ssh
-      nio4r (>= 0.5.0)
       retryable
       solve (>= 0.4.4)
       varia_model (~> 0.1)
@@ -138,7 +138,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 1.0)
-    solve (0.8.1)
+    solve (0.8.2)
     spiceweasel (2.6.0)
       berkshelf (< 3)
       chef (>= 0.10)
@@ -150,9 +150,10 @@ GEM
       yajl-ruby
     systemu (2.5.2)
     thor (0.18.1)
-    timers (1.1.0)
-    uuidtools (2.1.4)
-    varia_model (0.2.0)
+    timers (4.0.1)
+      hitimes
+    uuidtools (2.1.5)
+    varia_model (0.3.2)
       buff-extensions (~> 0.2)
       hashie (>= 2.0.2)
     wasabi (1.0.0)
@@ -171,7 +172,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf (~> 2.0.10)
+  berkshelf (~> 2.0.18)
   chef (~> 11.6.2)
   json (<= 1.7.7)
   knife-block (~> 0.0.6)