diff --git a/wpilibc/wpilibC++Devices/include/DriverStation.h b/wpilibc/wpilibC++Devices/include/DriverStation.h
index 1c45e8554a..996024a3ba 100644
--- a/wpilibc/wpilibC++Devices/include/DriverStation.h
+++ b/wpilibc/wpilibC++Devices/include/DriverStation.h
@@ -30,7 +30,7 @@ public:
 	static DriverStation *GetInstance();
 	static void ReportError(std::string error);
 
-	static const uint32_t kJoystickPorts = 4;
+	static const uint32_t kJoystickPorts = 6;
 
 	float GetStickAxis(uint32_t stick, uint32_t axis);
 	int GetStickPOV(uint32_t stick, uint32_t pov);
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
index 65b714198a..7b3bed6ea1 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
@@ -29,7 +29,7 @@ public class DriverStation implements RobotState.Interface {
     /**
      * Number of Joystick Ports
      */
-    public static final int kJoystickPorts = 4;
+    public static final int kJoystickPorts = 6;
     /**
      * Convert from raw values to volts
      */