diff --git a/proto/tendermint/blocksync/types.proto b/proto/tendermint/blocksync/types.proto
index 999a6db7f..4febfd145 100644
--- a/proto/tendermint/blocksync/types.proto
+++ b/proto/tendermint/blocksync/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.blocksync;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/blocksync";
+
 import "tendermint/types/block.proto";
 
 // BlockRequest requests a block for a specific height
diff --git a/proto/tendermint/consensus/types.proto b/proto/tendermint/consensus/types.proto
index fd0e427d0..7abe0d74b 100644
--- a/proto/tendermint/consensus/types.proto
+++ b/proto/tendermint/consensus/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.consensus;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus";
+
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
 import "tendermint/libs/bits/types.proto";
diff --git a/proto/tendermint/consensus/wal.proto b/proto/tendermint/consensus/wal.proto
index 22531e0d0..44afa2c0c 100644
--- a/proto/tendermint/consensus/wal.proto
+++ b/proto/tendermint/consensus/wal.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.consensus;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus";
+
 import "gogoproto/gogo.proto";
 import "tendermint/consensus/types.proto";
 import "tendermint/types/events.proto";
diff --git a/proto/tendermint/crypto/keys.proto b/proto/tendermint/crypto/keys.proto
index faaaed6fc..d66f9fc0c 100644
--- a/proto/tendermint/crypto/keys.proto
+++ b/proto/tendermint/crypto/keys.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.crypto;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto";
+
 import "gogoproto/gogo.proto";
 
 // PublicKey defines the keys available for use with Tendermint Validators
diff --git a/proto/tendermint/crypto/proof.proto b/proto/tendermint/crypto/proof.proto
index bde5a4ff9..975df7685 100644
--- a/proto/tendermint/crypto/proof.proto
+++ b/proto/tendermint/crypto/proof.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.crypto;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto";
+
 import "gogoproto/gogo.proto";
 
 message Proof {
diff --git a/proto/tendermint/libs/bits/types.proto b/proto/tendermint/libs/bits/types.proto
index 1ea81d33f..3111d113a 100644
--- a/proto/tendermint/libs/bits/types.proto
+++ b/proto/tendermint/libs/bits/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.libs.bits;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/libs/bits";
+
 message BitArray {
   int64           bits  = 1;
   repeated uint64 elems = 2;
diff --git a/proto/tendermint/mempool/types.proto b/proto/tendermint/mempool/types.proto
index 7fa53ef79..b55d9717b 100644
--- a/proto/tendermint/mempool/types.proto
+++ b/proto/tendermint/mempool/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.mempool;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/mempool";
+
 message Txs {
   repeated bytes txs = 1;
 }
diff --git a/proto/tendermint/p2p/conn.proto b/proto/tendermint/p2p/conn.proto
index 62abd4f5f..b12de6c82 100644
--- a/proto/tendermint/p2p/conn.proto
+++ b/proto/tendermint/p2p/conn.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.p2p;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+
 import "gogoproto/gogo.proto";
 import "tendermint/crypto/keys.proto";
 
diff --git a/proto/tendermint/p2p/pex.proto b/proto/tendermint/p2p/pex.proto
index 374047b0f..545743444 100644
--- a/proto/tendermint/p2p/pex.proto
+++ b/proto/tendermint/p2p/pex.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.p2p;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+
 import "gogoproto/gogo.proto";
 
 message PexAddress {
diff --git a/proto/tendermint/p2p/types.proto b/proto/tendermint/p2p/types.proto
index e4e86434a..faccd59d2 100644
--- a/proto/tendermint/p2p/types.proto
+++ b/proto/tendermint/p2p/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.p2p;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
diff --git a/proto/tendermint/statesync/types.proto b/proto/tendermint/statesync/types.proto
index 12f7a1d23..94e22e834 100644
--- a/proto/tendermint/statesync/types.proto
+++ b/proto/tendermint/statesync/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.statesync;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/statesync";
+
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
 import "tendermint/types/params.proto";
diff --git a/proto/tendermint/types/block.proto b/proto/tendermint/types/block.proto
index 8a713b7dc..84e9bb15d 100644
--- a/proto/tendermint/types/block.proto
+++ b/proto/tendermint/types/block.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
 import "tendermint/types/evidence.proto";
diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto
index 58d8c44e9..e88fd6ffe 100644
--- a/proto/tendermint/types/canonical.proto
+++ b/proto/tendermint/types/canonical.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/tendermint/types/events.proto b/proto/tendermint/types/events.proto
index 1ef715872..a1e5cc498 100644
--- a/proto/tendermint/types/events.proto
+++ b/proto/tendermint/types/events.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 message EventDataRoundState {
   int64  height = 1;
   int32  round  = 2;
diff --git a/proto/tendermint/types/evidence.proto b/proto/tendermint/types/evidence.proto
index d42c84363..44ef70cf6 100644
--- a/proto/tendermint/types/evidence.proto
+++ b/proto/tendermint/types/evidence.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "tendermint/types/types.proto";
diff --git a/proto/tendermint/types/params.proto b/proto/tendermint/types/params.proto
index a87670c9f..c5a9e048f 100644
--- a/proto/tendermint/types/params.proto
+++ b/proto/tendermint/types/params.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto
index d9e6973e9..bc2c53196 100644
--- a/proto/tendermint/types/types.proto
+++ b/proto/tendermint/types/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "tendermint/crypto/proof.proto";
diff --git a/proto/tendermint/types/validator.proto b/proto/tendermint/types/validator.proto
index 4ab5e4c32..49860b96d 100644
--- a/proto/tendermint/types/validator.proto
+++ b/proto/tendermint/types/validator.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.types;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+
 import "gogoproto/gogo.proto";
 import "tendermint/crypto/keys.proto";
 
diff --git a/proto/tendermint/version/types.proto b/proto/tendermint/version/types.proto
index d7d4cc09f..37124dd4e 100644
--- a/proto/tendermint/version/types.proto
+++ b/proto/tendermint/version/types.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package tendermint.version;
 
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/version";
+
 import "gogoproto/gogo.proto";
 
 // Consensus captures the consensus rules for processing a block in the