diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index d961b495e..1a1d47565 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -54,9 +54,10 @@ extern "C"
 
 // Number of pins defined in PinDescription array
 #define PINS_COUNT           (26u)
-#define NUM_DIGITAL_PINS     (14u)
+#define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (6u)
 #define NUM_ANALOG_OUTPUTS   (1u)
+#define analogInputToDigitalPin(p)  ((p < 6u) ? (p) + 14u : -1)
 
 #define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
 #define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
diff --git a/variants/mkr1000/variant.h b/variants/mkr1000/variant.h
index 0f306bf39..8a576f266 100644
--- a/variants/mkr1000/variant.h
+++ b/variants/mkr1000/variant.h
@@ -37,9 +37,10 @@
 
 // Number of pins defined in PinDescription array
 #define PINS_COUNT           (26u)
-#define NUM_DIGITAL_PINS     (15u)
+#define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (7u)
 #define NUM_ANALOG_OUTPUTS   (1u)
+#define analogInputToDigitalPin(p)  ((p < 7u) ? (p) + 15u : -1)
 
 // Low-level pin register query macros
 // -----------------------------------