diff --git a/logical/plugin/plugin.go b/logical/plugin/plugin.go
index 7eba9ed5ce..ede06229bc 100644
--- a/logical/plugin/plugin.go
+++ b/logical/plugin/plugin.go
@@ -5,6 +5,7 @@ import (
 	"crypto/rsa"
 	"encoding/gob"
 	"fmt"
+	"time"
 
 	"sync"
 
@@ -19,6 +20,7 @@ import (
 func init() {
 	gob.Register(rsa.PublicKey{})
 	gob.Register(ecdsa.PublicKey{})
+	gob.Register(time.Duration(0))
 }
 
 // BackendPluginClient is a wrapper around backendPluginClient
diff --git a/logical/plugin/serve.go b/logical/plugin/serve.go
index 7a52754c3b..1d70b3a177 100644
--- a/logical/plugin/serve.go
+++ b/logical/plugin/serve.go
@@ -50,7 +50,7 @@ func Serve(opts *ServeOpts) error {
 // This prevents users from executing bad plugins or executing a plugin
 // directory. It is a UX feature, not a security feature.
 var handshakeConfig = plugin.HandshakeConfig{
-	ProtocolVersion:  1,
+	ProtocolVersion:  2,
 	MagicCookieKey:   "VAULT_BACKEND_PLUGIN",
 	MagicCookieValue: "6669da05-b1c8-4f49-97d9-c8e5bed98e20",
 }