--- lisp/textmodes/flyspell.el
+++ lisp/textmodes/flyspell.el	2009-08-11 14:54:35.749901460 +0200
@@ -279,6 +279,12 @@ If `flyspell-large-region' is nil, all r
   "The key binding for flyspell auto correction."
   :group 'flyspell)
 
+(defvar flyspell-signature-separator
+  (if (boundp 'message-signature-separator)
+       message-signature-separator
+     "^-- $")
+  "*String used to recognize .signatures.")
+
 ;;*---------------------------------------------------------------------*/
 ;;*    Mode specific options                                            */
 ;;*    -------------------------------------------------------------    */
@@ -302,7 +308,6 @@ property of the major mode name.")
 ;;*--- mail mode -------------------------------------------------------*/
 (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
 (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
-(defvar message-signature-separator)
 (defun mail-mode-flyspell-verify ()
   "Function used for `flyspell-generic-check-word-predicate' in Mail mode."
   (let ((header-end (save-excursion
@@ -314,11 +319,11 @@ property of the major mode name.")
 		       nil t)
 		      (point)))
 	(signature-begin
-         (if (not (boundp 'message-signature-separator))
+         (if (not (boundp 'flyspell-signature-separator))
              (point-max)
            (save-excursion
              (goto-char (point-max))
-             (re-search-backward message-signature-separator nil t)
+             (re-search-backward flyspell-signature-separator nil t)
              (point)))))
     (cond ((< (point) header-end)
 	   (and (save-excursion (beginning-of-line)