diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
index ebbb4bd69ec..d09b8b8d7b5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
@@ -113,7 +113,7 @@ public class RegisterManager extends SessionObject {
 			for (int i = 0 ; i < regnos.length; i++) {
 				Register reg = getRegister(regnos[i]);
 				if (reg != null) {
-					eventList.add(new MIRegisterChangedEvent(reg.getName(), regnos[i]));
+					eventList.add(new MIRegisterChangedEvent(changed.getToken(), reg.getName(), regnos[i]));
 				}
 			}
 			MIEvent[] events = (MIEvent[])eventList.toArray(new MIEvent[0]);
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java
index 617ce9f7724..10edbae1852 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java
@@ -93,8 +93,7 @@ public class Variable extends CObject implements ICDIVariable {
 		}
 		
 		// If the assign was succesfull fire a MIVarChangedEvent()
-		// FIXME: Is this necessary?
-		MIVarChangedEvent change = new MIVarChangedEvent(miVar.getVarName(), true);
+		MIVarChangedEvent change = new MIVarChangedEvent(var.getToken(), miVar.getVarName(), true);
 		mi.fireEvent(change);
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
index 3bda87970a7..8d66f3e2a5a 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
@@ -105,7 +105,7 @@ public class VariableManager extends SessionObject implements ICDIExpressionMana
 				String varName = changes[i].getVarName();
 				Element element = getElement(varName);
 				if (element != null) {
-					eventList.add( new MIVarChangedEvent(varName, changes[i].isInScope()));
+					eventList.add(new MIVarChangedEvent(update.getToken(), varName, changes[i].isInScope()));
 				}
 				if (! changes[i].isInScope()) {
 					// Only remove ICDIVariables.