diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54285a589eb..2474574de92 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-29  Chong Yidong  <cyd@gnu.org>
+
+	* thingatpt.el (number-at-point): Apply a thing-at-point property.
+
 2012-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc/diff-mode.el (diff-context->unified): Don't get confused by "hunk
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index dedd9c8c189..50e3b785696 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -509,6 +509,7 @@ Signal an error if the entire string was not used."
 (defun number-at-point ()
   "Return the number at point, or nil if none is found."
   (form-at-point 'sexp 'numberp))
+(put 'number 'thing-at-point 'number-at-point)
 ;;;###autoload
 (defun list-at-point ()
   "Return the Lisp list at point, or nil if none is found."