diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9d1027a0fe..819ae30b98 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -28,6 +28,7 @@
 // 3  = MEGA/RAMPS up to 1.2 = 3
 // 33 = RAMPS 1.3 (Power outputs: Extruder, Bed, Fan)
 // 34 = RAMPS 1.3 (Power outputs: Extruder0, Extruder1, Bed)
+// 35 = RAMPS 1.3 (Power outputs: Extruder, Fan, Fan)
 // 4  = Duemilanove w/ ATMega328P pin assignment
 // 5  = Gen6
 // 51 = Gen6 deluxe
@@ -316,9 +317,9 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
 // The RepRapDiscount Smart Controller (white PCB)
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
-
-// The GADGETS3D G3D LCD/SD Controller (blue PCB)
-// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
+
+// The GADGETS3D G3D LCD/SD Controller (blue PCB)
+// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 //#define G3D_PANEL
 
 //automatic expansion
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 41aae2e221..0c48e12d88 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -305,7 +305,7 @@
 * Arduino Mega pin assignment
 *
 ****************************************************************************************/
-#if MOTHERBOARD == 3 || MOTHERBOARD == 33 || MOTHERBOARD == 34
+#if MOTHERBOARD == 3 || MOTHERBOARD == 33 || MOTHERBOARD == 34 || MOTHERBOARD == 35
 #define KNOWN_BOARD 1
 
 //////////////////FIX THIS//////////////
@@ -319,7 +319,7 @@
 // #define RAMPS_V_1_3
 // #define RAMPS_V_1_0
 
-#if MOTHERBOARD == 33 || MOTHERBOARD == 34
+#if MOTHERBOARD == 33 || MOTHERBOARD == 34 || MOTHERBOARD == 35
 
 #define X_STEP_PIN         54
 #define X_DIR_PIN          55
@@ -355,11 +355,14 @@
 #define SDSS               53
 #define LED_PIN            13
 
-#if MOTHERBOARD == 33
+#if MOTHERBOARD == 33 || MOTHERBOARD == 35
 #define FAN_PIN            9 // (Sprinter config)
 #else
 #define FAN_PIN            4 // IO pin. Buffer needed
 #endif
+#if MOTHERBOARD == 35
+#define CONTROLLERFAN_PIN  10 //Pin used for the fan to cool controller
+#endif
 #define PS_ON_PIN          12
 
 #if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
@@ -368,7 +371,11 @@
 #define KILL_PIN           -1
 #endif
 
+#if MOTHERBOARD == 35
+#define HEATER_0_PIN       8
+#else
 #define HEATER_0_PIN       10   // EXTRUDER 1
+#endif
 #if MOTHERBOARD == 33
 #define HEATER_1_PIN       -1
 #else
@@ -378,7 +385,11 @@
 #define TEMP_0_PIN         13   // ANALOG NUMBERING
 #define TEMP_1_PIN         15   // ANALOG NUMBERING
 #define TEMP_2_PIN         -1   // ANALOG NUMBERING
+#if MOTHERBOARD == 35
+#define HEATER_BED_PIN     -1
+#else
 #define HEATER_BED_PIN     8    // BED
+#endif
 #define TEMP_BED_PIN       14   // ANALOG NUMBERING
 
 #ifdef ULTRA_LCD
@@ -509,7 +520,7 @@
 #define TEMP_1_PIN          -1   
 #define TEMP_2_PIN          -1   
 #define TEMP_BED_PIN        1    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
-#endif// MOTHERBOARD == 33 || MOTHERBOARD == 34
+#endif// MOTHERBOARD == 33 || MOTHERBOARD == 34 || MOTHERBOARD == 35
 
 // SPI for Max6675 Thermocouple 
 
@@ -523,7 +534,7 @@
   #define MAX6675_SS       49
 #endif
 
-#endif//MOTHERBOARD == 3 || MOTHERBOARD == 33 || MOTHERBOARD == 34
+#endif//MOTHERBOARD == 3 || MOTHERBOARD == 33 || MOTHERBOARD == 34 || MOTHERBOARD == 35
 
 /****************************************************************************************
 * Duemilanove w/ ATMega328P pin assignment