diff --git a/variants/DEMO_F030F4/variant.cpp b/variants/DEMO_F030F4/variant.cpp
index fffb388eb1..243ab3f8b1 100644
--- a/variants/DEMO_F030F4/variant.cpp
+++ b/variants/DEMO_F030F4/variant.cpp
@@ -54,17 +54,20 @@ const PinName digitalPin[] = {
   PA_10, //D10 - SDA (RX UART Header)
   PA_13, //D11 - SWDIO
   PA_14, //D12 - SWCLK
+  // These two are only available on boards without a crystal:
+  PF_0,
+  PF_1,
   // Duplicated pins in order to be aligned with PinMap_ADC
   // A0 have to be greater than NUM_ANALOG_INPUTS
-  PA_0,  //D13/A0 ~ D0
-  PA_1,  //D14/A1 ~ D1
-  PA_2,  //D15/A2 ~ D2
-  PA_3,  //D16/A3 ~ D3
-  PA_4,  //D17/A4 ~ D4
-  PA_5,  //D18/A5 ~ D5
-  PA_6,  //D19/A6 ~ D6
-  PA_7,  //D20/A7 ~ D7
-  PB_1   //D21/A8 ~ D8
+  PA_0,  //D15/A0 ~ D0
+  PA_1,  //D16/A1 ~ D1
+  PA_2,  //D17/A2 ~ D2
+  PA_3,  //D18/A3 ~ D3
+  PA_4,  //D19/A4 ~ D4
+  PA_5,  //D20/A5 ~ D5
+  PA_6,  //D21/A6 ~ D6
+  PA_7,  //D22/A7 ~ D7
+  PB_1   //D23/A8 ~ D8
 };
 
 #ifdef __cplusplus
diff --git a/variants/DEMO_F030F4/variant.h b/variants/DEMO_F030F4/variant.h
index 08930af491..ba17044de7 100644
--- a/variants/DEMO_F030F4/variant.h
+++ b/variants/DEMO_F030F4/variant.h
@@ -54,12 +54,15 @@ extern "C" {
 #define PA10 10 //D10   - SDA (RX UART header)
 #define PA13 11 //D11   - SWDIO
 #define PA14 12 //D12   - SWCLK
+// Boards without a crystal can use these pins as well:
+#define PF0  13
+#define PF1  14
 
 // This must be a literal with the same value as PEND
-#define NUM_DIGITAL_PINS        22
+#define NUM_DIGITAL_PINS        24
 // This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       9
-#define NUM_ANALOG_FIRST        13
+#define NUM_ANALOG_FIRST        15
 
 // On-board LED pin number
 #define LED_BUILTIN             PA4