diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml
index 2f47f53..c48a020 100644
--- a/.kitchen.cloud.yml
+++ b/.kitchen.cloud.yml
@@ -17,7 +17,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/6"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/6"
 - name: ubuntu-14-04-x64
   driver:
     name: digitalocean
@@ -25,7 +25,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/ubuntu/trusty"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/ubuntu/trusty"
   run_list:
   - recipe[apt]
 - name: ubuntu-12-04-x64
@@ -35,7 +35,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/ubuntu/precise"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/ubuntu/precise"
   run_list:
   - recipe[apt]
 - name: debian-7-0-x64
@@ -45,7 +45,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/debian/7"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/debian/7"
   run_list:
   - recipe[apt]
 - name: centos-7-0-x64
@@ -55,7 +55,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/7"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/7"
   run_list:
   - recipe[yum-epel]
 - name: centos-6-5-x64
@@ -67,7 +67,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/6"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/6"
 - name: centos-5-8-x64
   driver:
     name: digitalocean
@@ -77,7 +77,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/5"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/5"
 - name: fedora-19-x64
   driver:
     name: digitalocean
@@ -85,7 +85,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/fedora/19"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/fedora/19"
   provisioner:
     root_path: /home/vagrant/kitchen
 
@@ -101,7 +101,7 @@ suites:
         version:
           major: "2"
           minor: "0"
-          incremental: "2"
+          incremental: "5"
 - name: search
   run_list:
   - recipe[riak]
@@ -112,7 +112,7 @@ suites:
         version:
           major: "2"
           minor: "0"
-          incremental: "2"
+          incremental: "5"
       config:
         search.top_level: "on"
   excludes: ["freebsd-10.1", "freebsd-9.2"]
@@ -125,7 +125,7 @@ suites:
         version:
           major: "2"
           minor: "0"
-          incremental: "2"
+          incremental: "5"
         local:
           url: ""
         enterprise_key: <%= (ENV["RIAK_ENTERPRISE_KEY"].nil? ? "" : ENV["RIAK_ENTERPRISE_KEY"]) %>
@@ -144,4 +144,4 @@ suites:
       source:
         major: "2"
         minor: "0"
-        incremental: "2"
+        incremental: "5"
diff --git a/.kitchen.yml b/.kitchen.yml
index fa11d6c..547f1a7 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -16,7 +16,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/ubuntu/trusty"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/ubuntu/trusty"
 - name: ubuntu-12.04
   run_list:
   - recipe[apt]
@@ -24,15 +24,15 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/ubuntu/precise"
-- name: debian-7.2.0
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/ubuntu/precise"
+- name: debian-7.8
   run_list:
   - recipe[apt]
   attributes:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/debian/7"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/debian/7"
 - name: centos-7.0
   run_list:
   - recipe[yum-epel]
@@ -40,29 +40,29 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/7"
-- name: centos-6.5
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/7"
+- name: centos-6.6
   run_list:
   - recipe[yum-epel]
   attributes:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/6"
-- name: centos-5.10
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/6"
+- name: centos-5.11
   run_list:
   - recipe[yum-epel]
   attributes:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/rhel/5"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/rhel/5"
 - name: fedora-19
   attributes:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/fedora/19"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/fedora/19"
   provisioner:
     root_path: /home/vagrant/kitchen
 - name: freebsd-10.1
@@ -75,7 +75,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/freebsd/10"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/freebsd/10"
 - name: freebsd-9.2
   driver:
     guest: ":freebsd"
@@ -86,7 +86,7 @@ platforms:
     riak:
       package:
         local:
-          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.2/freebsd/9.2"
+          url: "http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.5/freebsd/9.2"
 suites:
 - name: default
   run_list:
@@ -97,7 +97,7 @@ suites:
         version:
           major: "2"
           minor: "0"
-          incremental: "2"
+          incremental: "5"
 - name: search
   run_list:
   - recipe[riak]
@@ -108,7 +108,7 @@ suites:
         version:
           major: "2"
           minor: "0"
-          incremental: "2"
+          incremental: "5"
       config:
         search.top_level: "on"
   excludes: ["freebsd-10.1", "freebsd-9.2"]
@@ -121,7 +121,7 @@ suites:
         version:
           major: "2"
           minor: "0"
-          incremental: "2"
+          incremental: "5"
         local:
           url: ""
         enterprise_key: <%= (ENV["RIAK_ENTERPRISE_KEY"].nil? ? "" : ENV["RIAK_ENTERPRISE_KEY"]) %>
@@ -140,4 +140,4 @@ suites:
       source:
         major: "2"
         minor: "0"
-        incremental: "2"
+        incremental: "5"
diff --git a/Gemfile b/Gemfile
index b7ce78f..5ec1814 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,16 +2,16 @@ source 'https://rubygems.org'
 
 group :lint do
   gem 'foodcritic', '~> 4.0'
-  gem 'rubocop',    '= 0.26.1'
+  gem 'rubocop',    '= 0.28.0'
 end
 
 group :unit do
-  gem 'berkshelf',  '~> 3.1'
+  gem 'berkshelf',  '~> 3.2.3'
   gem 'chefspec',   '~> 4.0'
 end
 
 group :kitchen_common do
-  gem 'test-kitchen', '~> 1.2'
+  gem 'test-kitchen', '~> 1.3.1'
 end
 
 group :kitchen_vagrant do
diff --git a/attributes/package.rb b/attributes/package.rb
index 22d93ef..dbb887c 100644
--- a/attributes/package.rb
+++ b/attributes/package.rb
@@ -20,32 +20,32 @@
 
 default['riak']['package']['version']['major'] = '2'
 default['riak']['package']['version']['minor'] = '0'
-default['riak']['package']['version']['incremental'] = '2'
+default['riak']['package']['version']['incremental'] = '5'
 default['riak']['package']['version']['build'] = '1'
 default['riak']['package']['local']['url'] = ''
 
 default['riak']['package']['local']['checksum'].tap do |checksum|
-  checksum['ubuntu']['14']   = 'cab9b89cd0ee82528669facee149c9d6f2a0d0e6fa89496406133ca9c28cd48e'
-  checksum['ubuntu']['12']   = 'db290d17208861b2eb8694d2eb3d1dc8e7ad280edf577fac8bd355446ca6b85a'
-  checksum['debian']['7']    = '31ca5d472e992e3af267b440945239b110354a64fc197d2a3d73b93fc66483d4'
-  checksum['centos']['7']    = '15a732f0b79c934f8dbc3d5b86124a0eedfe7da6e1df84a595df15b2b703106d'
-  checksum['centos']['6']    = 'ab51c3d65dcd63c1f8d94bdd241b26671b18fcb19d272f4397d07021cfa71a3c'
-  checksum['centos']['5']    = '8b829b6b7349ace62d7a69ccb113ea5d52f5f39f4f39b08c900e5ffed1119cf5'
-  checksum['fedora']['19']   = '7f182beaa3c79ac023811d23ef3957a07fabebd128b62fcc77ac710b98c72b98'
-  checksum['freebsd']['10']  = '8b3afb7f3896678ed6aca0533d94510db9aa2c59f2bbac8a03277906ab9e8b8b'
-  checksum['freebsd']['9']   = '5b67b8f9d8488f848a54e6ee733d67964a2381ee06b35d60044f1f61b3da2f7c'
+  checksum['ubuntu']['14']   = '186f6b4890bb72aaab5c0a2b6cd31ff90f2098d8a50c955a8ed3a80e26d67c57'
+  checksum['ubuntu']['12']   = 'cad764ad5296c6d9a8d4b2bd4e60ece218a72206ea3369c9eb36d43c6737f5e6'
+  checksum['debian']['7']    = '4aa02b5e442fface7e17d00bd1958aecbfe5377d44005a87f85b0f17b723a974'
+  checksum['centos']['7']    = '6151acd0be1b916600c13da4cf55811afe055a0fc6a253a7e75751e239aff584'
+  checksum['centos']['6']    = '25434359e61eb284a595160fec552854b0971ffee3a569bdf9957c5cf04643b6'
+  checksum['centos']['5']    = '2fc3cc3e151bce4b4774bd503658b92f973e78ecae0ce2912cff19023a547638'
+  checksum['fedora']['19']   = 'f4213903776d50f336184fc0fb57a1d173d03a51838e84030dc82400598951fc'
+  checksum['freebsd']['10']  = '51030f81a5165baea71f17ba70d1ded47937c5893ae115de8353b09f96846196'
+  checksum['freebsd']['9']   = '408d4ee01b07c95c8f5fbe8d2236a4c79c77e0a0ec9fb1967da4cc9b0cde7c32'
   checksum['amazon']['2014'] = checksum['centos']['6']
 end
 
 default['riak']['package']['enterprise']['checksum'].tap do |checksum|
-  checksum['ubuntu']['14']   = '5228de901e41e7b0843b3ed5a26787e29ed5ee8bdfd3f93b4856803022335967'
-  checksum['ubuntu']['12']   = '983c4ba5466395095f0208d6208acfb416fe157dc4c27e796c71962e6a05c684'
-  checksum['debian']['7']    = 'b86b9200f29b48bbd44b2110ec96662e81b7ac60e096cebdd49feddacf07ae20'
-  checksum['centos']['7']    = '31b4f78cd4dfb30ffbdb1ac67adf720be1ac6def5378b6c8221e20fcfc2590ba'
-  checksum['centos']['6']    = 'fafe91dc2b858aeed178eebb29a89c082dbd081fe3b66b7827b801b81c309321'
-  checksum['centos']['5']    = 'a0b4f563810080e7643c6a2289405145df3bc38b53d83f2608b8cf20898e34bf'
-  checksum['fedora']['19']   = '2ebca241f0ecbd547b07dd94e06215afd2507061f1ff47d91f5221a28d06544c'
-  checksum['freebsd']['10']  = '630add5aad5d33eb12616e0b79ab5de6dd3c49003aaf06b84237f070c422bbe5'
-  checksum['freebsd']['9']   = 'f548cef733a077d3f01efd8586153fe411377323f80bc66f394b151ac485f24a'
+  checksum['ubuntu']['14']   = '9067483379c3850603c84d68205e5dd2dbda7b05dddeb1c5f6a0635c645e7c60'
+  checksum['ubuntu']['12']   = '64732720e3576c05854728f885fd4d16822be4d5072fd279a84c3b1cb39a238b'
+  checksum['debian']['7']    = '33be225c6db815f0a6dbbdb26c5de3bb75cb0392f1748edd9711b56d77f22207'
+  checksum['centos']['7']    = 'c5332a5ee767526fd7633346042d50cfbe2b8393ba2541a62028f2739df62e86'
+  checksum['centos']['6']    = '2c3e46b01ae6c6715f32b8ff2d41c9818955412f079f25d374732182f4264b0e'
+  checksum['centos']['5']    = '77f890b6a9856144863bc2df7c9d361c340f3356263d6e0ed171e1c8ded0f5c7'
+  checksum['fedora']['19']   = '00eea47bca420d9a7e0a84679c0ee00a98b6058efa4156356765feb97a4290e5'
+  checksum['freebsd']['10']  = 'c9fda9077c6e4741cd8200d12a5f963bef0cebe2e09ae432ef17e6299c6ab65e'
+  checksum['freebsd']['9']   = '153305c12085acc6cd2440a71c177872d7d3fd0a9b5c2647ab81a09d5ca4d670'
   checksum['amazon']['2014'] = checksum['centos']['6']
 end
diff --git a/attributes/source.rb b/attributes/source.rb
index f14ce27..04ac9c0 100644
--- a/attributes/source.rb
+++ b/attributes/source.rb
@@ -19,7 +19,7 @@
 default['riak']['source']['url'] = 'http://s3.amazonaws.com/downloads.basho.com/riak'
 default['riak']['source']['version']['major'] = '2'
 default['riak']['source']['version']['minor'] = '0'
-default['riak']['source']['version']['incremental'] = '2'
+default['riak']['source']['version']['incremental'] = '5'
 default['riak']['source']['prefix'] = '/opt'
 
-default['riak']['source']['checksum'] = 'c593c02d520f5a1d006df92fea59fc0152ae60c118fd5f1150a29b994b84911c'
+default['riak']['source']['checksum'] = '390cd596762a7465712b472eb7058314a400068fa1ad567b93530eecdaed8047'