Use the keymap property instead of local-map, and don't use a minor-mode map. (flyspell-mode-map): Variable deleted. Don't mess with minor-mode-map-alist. (calling add-minor-mode): Specify nil for keymap. And always use add-minor-mode, now that it exists. (flyspell-overlay-keymap-property-name): Set it to `keymap'. (flyspell-mode-on): Don't locally bind flyspell-mouse-map or flyspell-local-mouse-map. (make-flyspell-overlay): Use flyspell-mouse-map directly. (flyspell-mode): Doc fix. (flyspell-mode-on): Don't call make-local-hook.