diff --git a/docs/package_nRF5_boards_index.json b/docs/package_nRF5_boards_index.json
index 7b5898ee..dc400b62 100644
--- a/docs/package_nRF5_boards_index.json
+++ b/docs/package_nRF5_boards_index.json
@@ -352,6 +352,60 @@
               "version": "0.10.0-dev.nrf5"
             }
           ]
+        },
+        {
+          "name": "Nordic Semiconductor nRF5 Boards",
+          "architecture": "nRF5",
+          "version": "0.8.0",
+          "category": "Contributed",
+          "help": {
+            "online": "https://github.com/sandeepmistry/arduino-nRF5/issues"
+          },
+          "url": "https://github.com/sandeepmistry/arduino-nRF5/archive/0.8.0.tar.gz",
+          "archiveFileName": "arduino-nRF52-0.8.0.tar.gz",
+          "checksum": "MD5:84da4097f5518bcaa0752ff31927504f",
+          "size": "1488561",
+          "boards": [
+            {"name": "BBC micro:bit"},
+            {"name": "BBC micro:bit v2"},
+            {"name": "Bluz DK"},
+            {"name": "Calliope mini"},
+            {"name": "Calliope mini V3"},
+            {"name": "decaWave DWM1001 Module Development Board"},
+            {"name": "Electronut labs bluey"},
+            {"name": "Electronut labs hackaBLE"},
+            {"name": "Electronut labs hackaBLE v2"},
+            {"name": "Generic nRF51822"},
+            {"name": "Generic nRF52823"},
+            {"name": "Generic nRF52833"},
+            {"name": "OSHChip"},
+            {"name": "ng-beacon"},
+            {"name": "nRF51 Dongle"},
+            {"name": "nRF51822 Development Kit"},
+            {"name": "nRF52 DK"},
+            {"name": "Nordic Beacon Kit"},
+            {"name": "RedBear BLE Nano 2"},
+            {"name": "RedBear Blend 2"},
+            {"name": "RedBearLab BLE Nano"},
+            {"name": "RedBearLab nRF51822"},
+            {"name": "Seeed Arch Link"},
+            {"name": "Sino:bit"},
+            {"name": "Taida Century nRF52 mini board"},
+            {"name": "TinyBLE"},
+            {"name": "Waveshare BLE400"}
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "sandeepmistry",
+              "name": "gcc-arm-none-eabi",
+              "version": "5_2-2015q4"
+            },
+            {
+              "packager": "sandeepmistry",
+              "name": "openocd",
+              "version": "0.10.0-dev.nrf5"
+            }
+          ]
         }
       ],
       "tools":[
diff --git a/variants/CalliopeminiV3/variant.cpp b/variants/CalliopeminiV3/variant.cpp
index 70ad464c..99b01b89 100644
--- a/variants/CalliopeminiV3/variant.cpp
+++ b/variants/CalliopeminiV3/variant.cpp
@@ -27,7 +27,7 @@ const uint32_t g_ADigitalPinMap[] = {
   17, // SCK
   1,  // MISO
   13, // MOSI
-  29, // A5, C16_A1RX (Calliope change)
+  29, // A7, C16_A1RX (Calliope change)
 
   // 17 + 18
   34, // P1.02 C17 (Calliope exclusive pin)
diff --git a/variants/CalliopeminiV3/variant.h b/variants/CalliopeminiV3/variant.h
index ee8d5050..2e9db313 100644
--- a/variants/CalliopeminiV3/variant.h
+++ b/variants/CalliopeminiV3/variant.h
@@ -34,10 +34,11 @@ extern "C"
 #define PIN_A0				(0)
 #define PIN_A1				(1)
 #define PIN_A2				(2)
-#define PIN_A3				(3)
+#define PIN_A3				(18)
 #define PIN_A4				(4)
 #define PIN_A5				(10)
 #define PIN_A6				(29)
+#define PIN_A7				(16)
 
 #define ADC_RESOLUTION 10
 static const uint8_t A0 = PIN_A0;
@@ -47,6 +48,7 @@ static const uint8_t A3 = PIN_A3;
 static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 static const uint8_t A6 = PIN_A6;
+static const uint8_t A7 = PIN_A7;
 
 // Serial