diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d8308a9..fc96df61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
-# master
+# 1.3.0
 
 * Enhancements
   * Added warning messages to startup when using github/file_store endpoints
+  * Bump Octokit dependency to ~> 3.0
+
+* Bug Fix
+  * Fixed issue with GH indexing where there were a high number of repositories in an organization
 
 # 1.2.2
 
diff --git a/Gemfile b/Gemfile
index 3c9bf6cd..e3ba7e33 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ gemspec
 
 group :development do
   gem 'berkflow', github: "reset/berkflow"
+  gem 'berkshelf', github: "berkshelf/berkshelf"
   gem 'thor',      '~> 0.18'
   gem 'chef-zero', '~> 1.5'
   gem 'coolline'
diff --git a/Gemfile.lock b/Gemfile.lock
index be782e11..4405340e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,30 @@
+GIT
+  remote: git://github.com/berkshelf/berkshelf.git
+  revision: 3eafa53fd0afa3d89cce48e2efe61bf32ec9a7b5
+  specs:
+    berkshelf (3.0.1)
+      addressable (~> 2.3.4)
+      berkshelf-api-client (~> 1.2)
+      buff-config (~> 0.2)
+      buff-extensions (~> 0.4)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
+      faraday (~> 0.9.0)
+      minitar (~> 0.5.4)
+      octokit (~> 3.0)
+      retryable (~> 1.3.3)
+      ridley (~> 3.0)
+      solve (~> 1.1)
+      thor (~> 0.18)
+
 GIT
   remote: git://github.com/reset/berkflow.git
-  revision: 930549138f041c68a4f6a1f6bc37e0c08a498e90
+  revision: ac389447748781115b426dae3c850e6c60b26160
   specs:
-    berkflow (0.4.0)
+    berkflow (0.5.0)
       berkshelf (~> 3.0)
-      octokit (~> 2.6)
+      octokit (~> 3.0)
       ridley (~> 3.0)
       ridley-connectors (~> 2.0)
       semverse (~> 1.1)
@@ -13,7 +33,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf-api (1.2.2)
+    berkshelf-api (1.3.0)
       archive (= 0.0.6)
       buff-config (~> 0.1)
       celluloid (~> 0.16.0.pre)
@@ -22,7 +42,7 @@ PATH
       grape (~> 0.6)
       grape-msgpack (~> 0.1)
       hashie (>= 2.0.4)
-      octokit (~> 2.6)
+      octokit (~> 3.0)
       reel (~> 0.5.0)
       retryable (~> 1.3.3)
       ridley (~> 3.0)
@@ -38,7 +58,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     addressable (2.3.6)
-    akami (1.2.1)
+    akami (1.2.2)
       gyoku (>= 0.4.0)
       nokogiri
     archive (0.0.6)
@@ -47,21 +67,6 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    berkshelf (3.0.1)
-      addressable (~> 2.3.4)
-      berkshelf-api-client (~> 1.2)
-      buff-config (~> 0.2)
-      buff-extensions (~> 0.4)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
-      faraday (~> 0.9.0)
-      minitar (~> 0.5.4)
-      octokit (~> 2.6)
-      retryable (~> 1.3.3)
-      ridley (~> 3.0)
-      solve (~> 1.1)
-      thor (~> 0.18)
     berkshelf-api-client (1.2.0)
       faraday (~> 0.9.0)
     buff-config (0.4.0)
@@ -174,8 +179,8 @@ GEM
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     nori (1.1.5)
-    octokit (2.7.2)
-      sawyer (~> 0.5.2)
+    octokit (3.1.0)
+      sawyer (~> 0.5.3)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -247,7 +252,7 @@ GEM
       faraday (~> 0.8, < 0.10)
     semverse (1.1.0)
     slop (3.5.0)
-    solve (1.1.0)
+    solve (1.2.0)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
     spork (0.9.2)
@@ -284,6 +289,7 @@ PLATFORMS
 
 DEPENDENCIES
   berkflow!
+  berkshelf!
   berkshelf-api!
   chef-zero (~> 1.5)
   coolline
diff --git a/lib/berkshelf/api/version.rb b/lib/berkshelf/api/version.rb
index f7f2ef54..561c7f77 100644
--- a/lib/berkshelf/api/version.rb
+++ b/lib/berkshelf/api/version.rb
@@ -1,5 +1,5 @@
 module Berkshelf
   module API
-    VERSION = "1.2.2"
+    VERSION = "1.3.0"
   end
 end