diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index cadbc7142..c880b3d32 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -345,8 +345,9 @@
 #define BOARD_LERDGE_X                4215  // Lerdge X (STM32F407VE)
 #define BOARD_VAKE403D                4216  // VAkE 403D (STM32F446VET6)
 #define BOARD_FYSETC_S6               4217  // FYSETC S6 board
-#define BOARD_FLYF407ZG               4218  // FLYF407ZG board (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4219  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_FYSETC_S6_V2_0          4218  // FYSETC S6 v2.0 board
+#define BOARD_FLYF407ZG               4219  // FLYF407ZG board (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4220  // MKS_ROBIN2 (STM32F407ZE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index f2aec72c4..22f6ea663 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -606,6 +606,8 @@
   #include "stm32f4/pins_FLYF407ZG.h"           // STM32F4                                env:FLYF407ZG
 #elif MB(MKS_ROBIN2)
   #include "stm32f4/pins_MKS_ROBIN2.h"          // STM32F4                                env:MKS_ROBIN2
+#elif MB(FYSETC_S6_V2_0)
+  #include "stm32f4/pins_FYSETC_S6_V2_0.h"      // STM32F4                                env:FYSETC_S6
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 116aa14cf..9ffedc2ac 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "FYSETC_S6"
+  #define BOARD_INFO_NAME "FYSETC S6"
 #endif
 #ifndef DEFAULT_MACHINE_NAME
   #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
@@ -82,7 +82,9 @@
 //
 #define X_STEP_PIN                          PE11
 #define X_DIR_PIN                           PE10
-#define X_ENABLE_PIN                        PE12
+#ifndef X_ENABLE_PIN
+  #define X_ENABLE_PIN                      PE12
+#endif
 #define X_CS_PIN                            PE7
 
 #define Y_STEP_PIN                          PD8
@@ -118,23 +120,42 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN                   PE9
-  #define X_SERIAL_RX_PIN                   PE8
-
-  #define Y_SERIAL_TX_PIN                   PE14
-  #define Y_SERIAL_RX_PIN                   PE13
-
-  #define Z_SERIAL_TX_PIN                   PD11
-  #define Z_SERIAL_RX_PIN                   PD12
-
-  #define E0_SERIAL_TX_PIN                  PD3
-  #define E0_SERIAL_RX_PIN                  PA15
-
-  #define E1_SERIAL_TX_PIN                  PC4
-  #define E1_SERIAL_RX_PIN                  PC5
-
-  #define E2_SERIAL_TX_PIN                  PE1
-  #define E2_SERIAL_RX_PIN                  PE0
+  #ifndef X_SERIAL_TX_PIN
+    #define X_SERIAL_TX_PIN                 PE9
+  #endif
+  #ifndef X_SERIAL_RX_PIN
+    #define X_SERIAL_RX_PIN                 PE8
+  #endif
+  #ifndef Y_SERIAL_TX_PIN
+    #define Y_SERIAL_TX_PIN                 PE14
+  #endif
+  #ifndef Y_SERIAL_RX_PIN
+    #define Y_SERIAL_RX_PIN                 PE13
+  #endif
+  #ifndef Z_SERIAL_TX_PIN
+    #define Z_SERIAL_TX_PIN                 PD11
+  #endif
+  #ifndef Z_SERIAL_RX_PIN
+    #define Z_SERIAL_RX_PIN                 PD12
+  #endif
+  #ifndef E0_SERIAL_TX_PIN
+    #define E0_SERIAL_TX_PIN                PD3
+  #endif
+  #ifndef E0_SERIAL_RX_PIN
+    #define E0_SERIAL_RX_PIN                PA15
+  #endif
+  #ifndef E1_SERIAL_TX_PIN
+    #define E1_SERIAL_TX_PIN                PC4
+  #endif
+  #ifndef E1_SERIAL_RX_PIN
+    #define E1_SERIAL_RX_PIN                PC5
+  #endif
+  #ifndef E2_SERIAL_TX_PIN
+    #define E2_SERIAL_TX_PIN                PE1
+  #endif
+  #ifndef E2_SERIAL_RX_PIN
+    #define E2_SERIAL_RX_PIN                PE0
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
new file mode 100644
index 000000000..6cd970501
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
@@ -0,0 +1,67 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "FYSETC S6 2.0"
+
+//
+// EEPROM Emulation
+//
+#if NO_EEPROM_SELECTED
+  #undef NO_EEPROM_SELECTED
+  //#define FLASH_EEPROM_EMULATION
+  //#define SRAM_EEPROM_EMULATION
+  #define I2C_EEPROM
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PE9
+
+#if HAS_TMC_UART
+  #define X_SERIAL_TX_PIN                   PE8
+  #define Y_SERIAL_TX_PIN                   PC4
+  #define Y_SERIAL_RX_PIN                   PC4
+  #define Z_SERIAL_TX_PIN                   PD12
+  #define E0_SERIAL_TX_PIN                  PA15
+  #define E1_SERIAL_TX_PIN                  PC5
+  #define E2_SERIAL_TX_PIN                  PE0
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#define TMC_USE_SW_SPI
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PE14
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PE13
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PE12
+  #endif
+#endif
+
+#include "pins_FYSETC_S6.h"