diff --git a/Gemfile b/Gemfile
index 8cfc018f19..be0b02c145 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,11 @@ source "https://rubygems.org"
 
 gem "boxen",                  "~> 2.9.0"
 gem "hiera",                  "~> 1.3.3"
-gem "librarian-puppet",       "~> 1.0.9"
+gem "librarian-puppet"
 gem "puppet",                 "3.7.1"
+gem "librarianp",
+  git: "https://github.com/voxpupuli/librarian.git",
+  branch: "librarianp"
 gem "puppet-lint",            "0.3.2"
 gem "puppetlabs_spec_helper", "0.4.1"
 gem "open4",                  "~> 1.3.4"
diff --git a/Gemfile.lock b/Gemfile.lock
index 64ecd58a68..e1de360229 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/voxpupuli/librarian.git
+  revision: 4d78d88be2d7673a136e78760085fbf9664ff27d
+  branch: librarianp
+  specs:
+    librarianp (0.6.3)
+      thor (~> 0.15)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -28,7 +36,7 @@ GEM
     highline (1.6.21)
     jmespath (1.0.2)
       multi_json (~> 1.0)
-    json (1.8.3)
+    json (2.1.0)
     json_pure (1.8.2)
     librarian (0.1.2)
       highline
@@ -91,7 +99,7 @@ GEM
       net-ssh (>= 2.7, < 4.0)
       net-telnet
       sfl
-    thor (0.19.1)
+    thor (0.20.0)
 
 PLATFORMS
   ruby
@@ -101,7 +109,8 @@ DEPENDENCIES
   boxen (~> 2.9.0)
   deep_merge (~> 1.0)
   hiera (~> 1.3.3)
-  librarian-puppet (~> 1.0.9)
+  librarian-puppet
+  librarianp!
   net-ssh
   open4 (~> 1.3.4)
   puppet (= 3.7.1)
diff --git a/vendor/cache/json-1.8.3.gem b/vendor/cache/json-1.8.3.gem
deleted file mode 100644
index 6474a4fcf3..0000000000
Binary files a/vendor/cache/json-1.8.3.gem and /dev/null differ
diff --git a/vendor/cache/json-2.1.0.gem b/vendor/cache/json-2.1.0.gem
new file mode 100644
index 0000000000..23d69ffecc
Binary files /dev/null and b/vendor/cache/json-2.1.0.gem differ
diff --git a/vendor/cache/thor-0.19.1.gem b/vendor/cache/thor-0.19.1.gem
deleted file mode 100644
index 1ca502f3a5..0000000000
Binary files a/vendor/cache/thor-0.19.1.gem and /dev/null differ
diff --git a/vendor/cache/thor-0.20.0.gem b/vendor/cache/thor-0.20.0.gem
new file mode 100644
index 0000000000..8618f62875
Binary files /dev/null and b/vendor/cache/thor-0.20.0.gem differ