diff --git a/user/src/com/google/gwt/user/client/ui/TextBoxBase.java b/user/src/com/google/gwt/user/client/ui/TextBoxBase.java
index 9fbad0c..d143c8b 100644
--- a/user/src/com/google/gwt/user/client/ui/TextBoxBase.java
+++ b/user/src/com/google/gwt/user/client/ui/TextBoxBase.java
@@ -19,6 +19,7 @@
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.HasChangeHandlers;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
@@ -31,7 +32,7 @@
  */
 @SuppressWarnings("deprecation")
 public class TextBoxBase extends FocusWidget implements SourcesChangeEvents,
-    HasText, HasName, HasValue<String> {
+    HasChangeHandlers, HasText, HasName, HasValue<String> {
 
   /**
    * Text alignment constant, used in
@@ -88,9 +89,13 @@
     super(elem);
   }
 
+  public HandlerRegistration addChangeHandler(ChangeHandler handler) {
+    return addDomHandler(handler, ChangeEvent.getType());
+  }
+
   @Deprecated
   public void addChangeListener(ChangeListener listener) {
-    addDomHandler(new ListenerWrapper.WrappedChangeListener(listener), ChangeEvent.getType());
+    addChangeHandler(new ListenerWrapper.WrappedChangeListener(listener));
   }
 
   public HandlerRegistration addValueChangeHandler(
@@ -98,11 +103,11 @@
     // Initialization code
     if (!valueChangeHandlerInitialized) {
       valueChangeHandlerInitialized = true;
-      addDomHandler(new ChangeHandler() {
+      addChangeHandler(new ChangeHandler() {
         public void onChange(ChangeEvent event) {
           ValueChangeEvent.fire(TextBoxBase.this, getText());
         }
-      }, ChangeEvent.getType());
+      });
     }
     return addHandler(handler, ValueChangeEvent.getType());
   }