diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea0deb90946..4add465d0c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-19  Leo Liu  <sdl.web@gmail.com>
+
+	* progmodes/octave.el (octave-help): Fix regexp.
+
 2013-06-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/shr.el (shr-make-table-1): Implement <td rowspan>.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index b1936467274..4e5a3058d4e 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -1666,9 +1666,7 @@ code line."
           (when (re-search-forward "^\\s-*See also:" nil t)
             (let ((end (save-excursion (re-search-forward "^\\s-*$" nil t))))
               (while (re-search-forward
-                      ;; Match operators and symbols.
-                      "\\(?1:\\s.+?\\)\\(?:$\\|[,;]\\|\\s-\\)\\|\\_<\\(?1:\\(?:\\sw\\|\\s_\\)+\\)\\_>"
-                      end t)
+                      "\\s-*\\([^,\n]+?\\)\\s-*\\(?:[,]\\|[.]?$\\)" end t)
                 (make-text-button (match-beginning 1) (match-end 1)
                                   :type 'octave-help-function)))))
         (octave-help-mode)))))