diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 2602e83a84..4083b0d1c1 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -278,6 +278,9 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
 	for (int i = 0; i < GPIO_COUNT; i++) {
 		boardConfiguration->gpioPins[i] = GPIO_NONE;
 	}
+	for (int i = 0; i < JOYSTICK_PIN_COUNT; i++) {
+		boardConfiguration->joystickPins[i] = GPIO_NONE;
+	}
 
 	boardConfiguration->idleValvePin = GPIOE_2;
 	boardConfiguration->idleValvePinMode = OM_DEFAULT;
diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index 939d89bfcb..dc051c0543 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -35,6 +35,8 @@ typedef struct {
 
 #define GPIO_COUNT 8
 
+#define JOYSTICK_PIN_COUNT 5
+
 #define FUEL_RPM_COUNT 16
 #define FUEL_LOAD_COUNT 16
 #define VE_RPM_COUNT 16
@@ -213,7 +215,9 @@ typedef struct {
 	brain_pin_e gpioPins[GPIO_COUNT];
 	pin_output_mode_e gpioPinModes[GPIO_COUNT];
 
-	int unusedbs[75];
+	brain_pin_e joystickPins[JOYSTICK_PIN_COUNT];
+
+	int unusedbs[70];
 
 
 } board_configuration_s;
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index b44bc58258..95098b6a93 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -235,5 +235,5 @@ void firmwareError(const char *fmt, ...) {
 }
 
 int getRusEfiVersion(void) {
-	return 20140924;
+	return 20140925;
 }