diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb71b40e067..933eb2bd94e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-31  Glenn Morris  <rgm@gnu.org>
 
+	* progmodes/f90.el (f90-find-tag-default): Handle multiple `%'.
+
 	* generic-x.el (etc-fstab-generic-mode): Add ext4, sysfs keywords.
 
 2011-03-30  Christoph Scholtes  <cschol2112@googlemail.com>
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index ed745ae784e..232299da4db 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2203,7 +2203,7 @@ CHANGE-WORD should be one of 'upcase-word, 'downcase-word, 'capitalize-word."
   (let ((tag (find-tag-default)))
     (or (and tag
              ;; See bug#7919. TODO I imagine there are other cases...?
-             (string-match "%\\(.+\\)" tag)
+             (string-match "%\\([^%]+\\)\\'" tag)
              (match-string-no-properties 1 tag))
         tag)))