diff --git a/wpilibc/wpilibC++Devices/include/CANJaguar.h b/wpilibc/wpilibC++Devices/include/CANJaguar.h
index 38e0e4b253..fddaf0d8b0 100644
--- a/wpilibc/wpilibC++Devices/include/CANJaguar.h
+++ b/wpilibc/wpilibC++Devices/include/CANJaguar.h
@@ -68,6 +68,8 @@ public:
 	explicit CANJaguar(uint8_t deviceNumber);
 	virtual ~CANJaguar();
 
+	uint8_t getDeviceNumber() const;
+
 	// SpeedController interface
 	virtual float Get();
 	virtual void Set(float value, uint8_t syncGroup=0);
diff --git a/wpilibc/wpilibC++Devices/src/CANJaguar.cpp b/wpilibc/wpilibC++Devices/src/CANJaguar.cpp
index 53f45a2853..62226c89c8 100644
--- a/wpilibc/wpilibC++Devices/src/CANJaguar.cpp
+++ b/wpilibc/wpilibC++Devices/src/CANJaguar.cpp
@@ -274,6 +274,14 @@ CANJaguar::~CANJaguar()
 	m_safetyHelper = NULL;
 }
 
+/**
+ * @return The CAN ID passed in the constructor
+ */
+uint8_t CANJaguar::getDeviceNumber() const
+{
+	return m_deviceNumber;
+}
+
 /**
  * Sets the output set-point value.
  *
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java
index 0019d6759f..2555529d70 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java
@@ -265,6 +265,14 @@ public class CANJaguar implements MotorSafety, PIDOutput, SpeedController, LiveW
 		configMaxOutputVoltage(kApproxBusVoltage);
 	}
 
+	/**
+	* @return The CAN ID passed in the constructor
+	*/
+	int getDeviceNumber()
+	{
+		return m_deviceNumber;
+	}
+
 	/**
 	 * Get the recently set outputValue set point.
 	 *