diff --git a/boards.txt b/boards.txt
index 58f5c2e6..86cfcb9e 100644
--- a/boards.txt
+++ b/boards.txt
@@ -201,3 +201,42 @@ espea32.menu.UploadSpeed.460800.upload.speed=460800
 espea32.menu.UploadSpeed.512000.windows=512000
 espea32.menu.UploadSpeed.512000.upload.speed=512000
 
+##############################################################
+quantum.name=Noduino Quantum
+
+quantum.upload.tool=esptool
+quantum.upload.maximum_size=1044464
+quantum.upload.maximum_data_size=294912
+quantum.upload.wait_for_upload_port=true
+
+quantum.serial.disableDTR=true
+quantum.serial.disableRTS=true
+
+quantum.build.mcu=esp32
+quantum.build.core=esp32
+quantum.build.variant=quantum
+quantum.build.board=QUANTUM
+
+quantum.build.f_cpu=160000000L
+quantum.build.flash_mode=qio
+quantum.build.flash_size=16MB
+
+quantum.menu.FlashFreq.80=80MHz
+quantum.menu.FlashFreq.80.build.flash_freq=80m
+quantum.menu.FlashFreq.40=40MHz
+quantum.menu.FlashFreq.40.build.flash_freq=40m
+
+quantum.menu.UploadSpeed.921600=921600
+quantum.menu.UploadSpeed.921600.upload.speed=921600
+quantum.menu.UploadSpeed.115200=115200
+quantum.menu.UploadSpeed.115200.upload.speed=115200
+quantum.menu.UploadSpeed.256000.windows=256000
+quantum.menu.UploadSpeed.256000.upload.speed=256000
+quantum.menu.UploadSpeed.230400.windows.upload.speed=256000
+quantum.menu.UploadSpeed.230400=230400
+quantum.menu.UploadSpeed.230400.upload.speed=230400
+quantum.menu.UploadSpeed.460800.linux=460800
+quantum.menu.UploadSpeed.460800.macosx=460800
+quantum.menu.UploadSpeed.460800.upload.speed=460800
+quantum.menu.UploadSpeed.512000.windows=512000
+quantum.menu.UploadSpeed.512000.upload.speed=512000
diff --git a/variants/quantum/pins_arduino.h b/variants/quantum/pins_arduino.h
new file mode 100644
index 00000000..aeab75c1
--- /dev/null
+++ b/variants/quantum/pins_arduino.h
@@ -0,0 +1,20 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#define NUM_ANALOG_INPUTS       18
+
+#define analogInputToDigitalPin(p)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+static const uint8_t SDA = 22;
+static const uint8_t SCL = 21;
+
+static const uint8_t SS    = 5;
+static const uint8_t MOSI  = 23;
+static const uint8_t MISO  = 19;
+static const uint8_t SCK   = 18;
+
+#endif /* Pins_Arduino_h */