diff --git a/mesh.proto b/mesh.proto
index 1e60b1c..c495eaf 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -841,7 +841,7 @@ message MeshPacket {
   uint32 channel = 3;
 
   /*
-   * Internally to the mesh radios we will route SubPackets encrypted per [this](/developers/device/encryption.md).
+   * Internally to the mesh radios we will route SubPackets encrypted per [this](docs/developers/firmware/encryption).
    * However, when a particular node has the correct
    * key to decode a particular packet, it will decode the payload into a SubPacket protobuf structure.
    * Software outside of the device nodes will never encounter a packet where
@@ -870,7 +870,7 @@ message MeshPacket {
    * needs to be unique for a few minutes (long enough to last for the length of
    * any ACK or the completion of a mesh broadcast flood).
    * Note: Our crypto implementation uses this id as well.
-   * See [crypto](/developers/device/encryption.md) for details.
+   * See [crypto](/docs/developers/firmware/encryption) for details.
    * FIXME - really should be fixed32 instead, this encoding only
    * hurts the ble link though.
    */
diff --git a/portnums.proto b/portnums.proto
index c0c3338..b40db86 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -59,25 +59,25 @@ enum PortNum {
 
   /*
    * The built-in position messaging app.
-   * Payload is a [Position](/developers/protobufs/api.md#position) message
+   * Payload is a [Position](/docs/developers/protobufs/api#position) message
    */
   POSITION_APP = 3;
 
   /*
    * The built-in user info app.
-   * Payload is a [User](/developers/protobufs/api.md#user) message
+   * Payload is a [User](/docs/developers/protobufs/api#user) message
    */
   NODEINFO_APP = 4;
 
   /*
    * Protocol control packets for mesh protocol use.
-   * Payload is a [Routing](/developers/protobufs/api.md#routing) message
+   * Payload is a [Routing](/docs/developers/protobufs/api#routing) message
    */
   ROUTING_APP = 5;
 
   /*
    * Admin control packets.
-   * Payload is a [AdminMessage](/developers/protobufs/api.md#adminmessage) message
+   * Payload is a [AdminMessage](/docs/developers/protobufs/api#adminmessage) message
    */
   ADMIN_APP = 6;
 
diff --git a/radioconfig.proto b/radioconfig.proto
index 0815b9a..ed6cfd6 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -439,7 +439,7 @@ enum InputEventChar {
 message RadioConfig {
 
   /*
-   * See [software design](/software/other/sw-design.md) for more information on these preferences
+   * See [software design](/docs/software/other/sw-design) for more information on these preferences
    */
   message UserPreferences {
 
@@ -470,21 +470,21 @@ message RadioConfig {
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of 1 minute
      */
     uint32 wait_bluetooth_secs = 4;
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of one minute
      */
     uint32 screen_on_secs = 5;
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of 15 minutes
      * IMPORTANT NOTE FOR DEVICE CLIENTS: YOU MUST SEND SOME SORT OF PACKET TO THE PHONE AT LEAST THIS OFTEN OR THE DEVICE WILL DECIDE YOU ARE GONE!
      */
@@ -492,35 +492,35 @@ message RadioConfig {
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of two hours, MAXUINT for disabled
      */
     uint32 phone_sds_timeout_sec = 7;
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of two hours, MAXUINT for disabled
      */
     uint32 mesh_sds_timeout_secs = 8;
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of one year
      */
     uint32 sds_secs = 9;
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of 3600
      */
     uint32 ls_secs = 10;
 
     /*
      * Power management state machine option.
-     * See [power management](/software/other/power.md) for details.
+     * See [power management](/docs/software/other/power) for details.
      * 0 for default of 10 seconds
      */
     uint32 min_wake_secs = 11;