diff --git a/boards.txt b/boards.txt
index e36294ea..622ecf8f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -545,3 +545,46 @@ onehorse32dev.menu.UploadSpeed.460800.macosx=460800
 onehorse32dev.menu.UploadSpeed.460800.upload.speed=460800
 onehorse32dev.menu.UploadSpeed.512000.windows=512000
 onehorse32dev.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+
+featheresp32.name=Adafruit ESP32 Feather
+
+featheresp32.upload.tool=esptool
+featheresp32.upload.maximum_size=1044464
+featheresp32.upload.maximum_data_size=294912
+featheresp32.upload.wait_for_upload_port=true
+
+featheresp32.serial.disableDTR=true
+featheresp32.serial.disableRTS=true
+
+featheresp32.build.mcu=esp32
+featheresp32.build.core=esp32
+featheresp32.build.variant=feather_esp32
+featheresp32.build.board=FEATHER_ESP32
+
+featheresp32.build.f_cpu=240000000L
+featheresp32.build.flash_mode=dio
+featheresp32.build.flash_size=4MB
+
+featheresp32.menu.FlashFreq.80=80MHz
+featheresp32.menu.FlashFreq.80.build.flash_freq=80m
+featheresp32.menu.FlashFreq.40=40MHz
+featheresp32.menu.FlashFreq.40.build.flash_freq=40m
+
+featheresp32.menu.UploadSpeed.921600=921600
+featheresp32.menu.UploadSpeed.921600.upload.speed=921600
+featheresp32.menu.UploadSpeed.115200=115200
+featheresp32.menu.UploadSpeed.115200.upload.speed=115200
+featheresp32.menu.UploadSpeed.256000.windows=256000
+featheresp32.menu.UploadSpeed.256000.upload.speed=256000
+featheresp32.menu.UploadSpeed.230400.windows.upload.speed=256000
+featheresp32.menu.UploadSpeed.230400=230400
+featheresp32.menu.UploadSpeed.230400.upload.speed=230400
+featheresp32.menu.UploadSpeed.460800.linux=460800
+featheresp32.menu.UploadSpeed.460800.macosx=460800
+featheresp32.menu.UploadSpeed.460800.upload.speed=460800
+featheresp32.menu.UploadSpeed.512000.windows=512000
+featheresp32.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
\ No newline at end of file
diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h
new file mode 100644
index 00000000..f952a83e
--- /dev/null
+++ b/variants/feather_esp32/pins_arduino.h
@@ -0,0 +1,63 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+static const uint8_t LED_BUILTIN = 13;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t TX = 17;
+static const uint8_t RX = 16;
+
+static const uint8_t SDA = 23;
+static const uint8_t SCL = 22;
+
+static const uint8_t SS    = 2;
+static const uint8_t MOSI  = 18;
+static const uint8_t MISO  = 19;
+static const uint8_t SCK   = 5;
+
+// mapping to match other feathers and also in order
+static const uint8_t A0 = 26; 
+static const uint8_t A1 = 25;
+static const uint8_t A2 = 34;
+static const uint8_t A3 = 39;
+static const uint8_t A4 = 36;
+static const uint8_t A5 = 4;
+static const uint8_t A6 = 14;
+static const uint8_t A7 = 32;
+static const uint8_t A8 = 15;
+static const uint8_t A9 = 33;
+static const uint8_t A10 = 27;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+
+// vbat measure
+static const uint8_t A13 = 35;
+//static const uint8_t Ax = 0; // not used/available
+//static const uint8_t Ax = 2; // not used/available
+
+
+static const uint8_t T0 = 4;
+static const uint8_t T1 = 0;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 15;
+static const uint8_t T4 = 13;
+static const uint8_t T5 = 12;
+static const uint8_t T6 = 14;
+static const uint8_t T7 = 27;
+static const uint8_t T8 = 33;
+static const uint8_t T9 = 32;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+#endif /* Pins_Arduino_h */