diff --git a/admin.proto b/admin.proto
index 2da1832..9bf4dd9 100644
--- a/admin.proto
+++ b/admin.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 import "channel.proto";
 import "config.proto";
diff --git a/apponly.proto b/apponly.proto
index 20bf565..7d1bb1b 100644
--- a/apponly.proto
+++ b/apponly.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generatedddd";
 
 import "channel.proto";
 import "config.proto";
diff --git a/cannedmessages.proto b/cannedmessages.proto
index bcbdd48..7f1f366 100644
--- a/cannedmessages.proto
+++ b/cannedmessages.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option java_outer_classname = "CannedMessageConfigProtos";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 /*
  * Canned message module configuration.
diff --git a/channel.proto b/channel.proto
index eaa7f15..ea2a23b 100644
--- a/channel.proto
+++ b/channel.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 option java_outer_classname = "ChannelProtos";
 
diff --git a/config.proto b/config.proto
index e97695a..dfdd3ad 100644
--- a/config.proto
+++ b/config.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option java_outer_classname = "ConfigProtos";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 message Config {
   /*
diff --git a/device_metadata.proto b/device_metadata.proto
index 4ec35a5..3492cd7 100644
--- a/device_metadata.proto
+++ b/device_metadata.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 option java_outer_classname = "DeviceMetadataProtos";
 
diff --git a/deviceonly.proto b/deviceonly.proto
index a43ac0d..d7284e2 100644
--- a/deviceonly.proto
+++ b/deviceonly.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 import "channel.proto";
 import "mesh.proto";
diff --git a/localonly.proto b/localonly.proto
index 0e4fcbe..f9a4bb7 100644
--- a/localonly.proto
+++ b/localonly.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 import "config.proto";
 import "module_config.proto";
diff --git a/mesh.proto b/mesh.proto
index 603b6c2..b997cc2 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 import "channel.proto";
 import "config.proto";
diff --git a/module_config.proto b/module_config.proto
index 24b7de3..05cfcba 100644
--- a/module_config.proto
+++ b/module_config.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option java_outer_classname = "ModuleConfigProtos";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 /*
  * Module Config
diff --git a/mqtt.proto b/mqtt.proto
index f3a5660..4045b1a 100644
--- a/mqtt.proto
+++ b/mqtt.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 import "mesh.proto";
 
diff --git a/portnums.proto b/portnums.proto
index 1ebd7f8..15747f6 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option java_outer_classname = "Portnums";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 /*
  * For any new 'apps' that run on the device or via sister apps on phones/PCs they should pick and use a
diff --git a/remote_hardware.proto b/remote_hardware.proto
index 5a5a060..d5cca42 100644
--- a/remote_hardware.proto
+++ b/remote_hardware.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option java_outer_classname = "RemoteHardware";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 /*
  * An example app to show off the module system. This message is used for
diff --git a/storeforward.proto b/storeforward.proto
index 226c965..45d163a 100644
--- a/storeforward.proto
+++ b/storeforward.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option java_outer_classname = "StoreAndForwardProtos";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 /*
  * TODO: REPLACE
diff --git a/telemetry.proto b/telemetry.proto
index 5492b21..57550e3 100644
--- a/telemetry.proto
+++ b/telemetry.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
-option go_package = "github.com/meshtastic/gomeshproto";
+option go_package = "github.com/meshtastic/go/generated";
 
 option java_outer_classname = "TelemetryProtos";