diff --git a/boards.txt b/boards.txt
index 751d0726..9b5bed6b 100644
--- a/boards.txt
+++ b/boards.txt
@@ -761,3 +761,63 @@ esp32doit-devkit-v1.menu.DebugLevel.info=Info
 esp32doit-devkit-v1.menu.DebugLevel.info.build.code_debug=3
 esp32doit-devkit-v1.menu.DebugLevel.debug=Debug
 esp32doit-devkit-v1.menu.DebugLevel.debug.build.code_debug=4
+
+##############################################################
+
+esp32-evb.name=OLIMEX ESP32-EVB
+
+esp32-evb.upload.tool=esptool
+esp32-evb.upload.maximum_size=1310720
+esp32-evb.upload.maximum_data_size=294912
+esp32-evb.upload.wait_for_upload_port=true
+
+esp32-evb.serial.disableDTR=true
+esp32-evb.serial.disableRTS=true
+
+esp32-evb.build.mcu=esp32
+esp32-evb.build.core=esp32
+esp32-evb.build.variant=esp32-evb
+esp32-evb.build.board=ESP32-EVB
+
+esp32-evb.build.f_cpu=240000000L
+esp32-evb.build.flash_mode=dio
+esp32-evb.build.flash_size=4MB
+
+esp32-evb.menu.FlashFreq.80=80MHz
+esp32-evb.menu.FlashFreq.80.build.flash_freq=80m
+esp32-evb.menu.FlashFreq.40=40MHz
+esp32-evb.menu.FlashFreq.40.build.flash_freq=40m
+
+
+esp32-evb.menu.UploadSpeed.115200=115200
+esp32-evb.menu.UploadSpeed.115200.upload.speed=115200
+
+##############################################################
+
+esp32-gateway.name=OLIMEX ESP32-GATEWAY
+
+esp32-gateway.upload.tool=esptool
+esp32-gateway.upload.maximum_size=1310720
+esp32-gateway.upload.maximum_data_size=294912
+esp32-gateway.upload.wait_for_upload_port=true
+
+esp32-gateway.serial.disableDTR=true
+esp32-gateway.serial.disableRTS=true
+
+esp32-gateway.build.mcu=esp32
+esp32-gateway.build.core=esp32
+esp32-gateway.build.variant=esp32-gateway
+esp32-gateway.build.board=ESP32-GATEWAY
+
+esp32-gateway.build.f_cpu=240000000L
+esp32-gateway.build.flash_mode=dio
+esp32-gateway.build.flash_size=4MB
+
+esp32-gateway.menu.FlashFreq.80=80MHz
+esp32-gateway.menu.FlashFreq.80.build.flash_freq=80m
+esp32-gateway.menu.FlashFreq.40=40MHz
+esp32-gateway.menu.FlashFreq.40.build.flash_freq=40m
+
+
+esp32-gateway.menu.UploadSpeed.115200=115200
+esp32-gateway.menu.UploadSpeed.115200.upload.speed=115200
diff --git a/variants/esp32-evb/pins_arduino.h b/variants/esp32-evb/pins_arduino.h
new file mode 100644
index 00000000..0a5a17bc
--- /dev/null
+++ b/variants/esp32-evb/pins_arduino.h
@@ -0,0 +1,28 @@
+#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 KEY_BUILTIN = 34;
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 13;
+static const uint8_t SCL = 16;
+
+static const uint8_t SS    = 17;
+static const uint8_t MOSI  = 2;
+static const uint8_t MISO  = 15;
+static const uint8_t SCK   = 14;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
new file mode 100644
index 00000000..19c21ec9
--- /dev/null
+++ b/variants/esp32-gateway/pins_arduino.h
@@ -0,0 +1,29 @@
+#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 = 33;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 34;
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t A0 = 36;
+static const uint8_t A3 = 39;
+static const uint8_t A4 = 32;
+static const uint8_t A7 = 35;
+
+static const uint8_t T9 = 32;
+
+#endif /* Pins_Arduino_h */