diff --git a/runtime/doc/tags b/runtime/doc/tags
index a835764..7eb179e 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -729,7 +729,9 @@
 'sourceany'	vi_diff.txt	/*'sourceany'*
 'sp'	options.txt	/*'sp'*
 'spell'	options.txt	/*'spell'*
+'spellfile'	options.txt	/*'spellfile'*
 'spelllang'	options.txt	/*'spelllang'*
+'spf'	options.txt	/*'spf'*
 'spl'	options.txt	/*'spl'*
 'splitbelow'	options.txt	/*'splitbelow'*
 'splitright'	options.txt	/*'splitright'*
@@ -2403,6 +2405,8 @@
 :source	repeat.txt	/*:source*
 :source_crnl	repeat.txt	/*:source_crnl*
 :sp	windows.txt	/*:sp*
+:spellg	spell.txt	/*:spellg*
+:spellgood	spell.txt	/*:spellgood*
 :split	windows.txt	/*:split*
 :split_f	windows.txt	/*:split_f*
 :spr	windows.txt	/*:spr*
@@ -6244,6 +6248,8 @@
 special-buffers	windows.txt	/*special-buffers*
 speed-up	tips.txt	/*speed-up*
 spell	spell.txt	/*spell*
+spell-affix-KEP	spell.txt	/*spell-affix-KEP*
+spell-affix-RAR	spell.txt	/*spell-affix-RAR*
 spell-affix-chars	spell.txt	/*spell-affix-chars*
 spell-affix-mbyte	spell.txt	/*spell-affix-mbyte*
 spell-affix-vim	spell.txt	/*spell-affix-vim*
@@ -7094,6 +7100,7 @@
 zd	fold.txt	/*zd*
 ze	scroll.txt	/*ze*
 zf	fold.txt	/*zf*
+zg	spell.txt	/*zg*
 zh	scroll.txt	/*zh*
 zi	fold.txt	/*zi*
 zj	fold.txt	/*zj*
@@ -7106,6 +7113,7 @@
 zs	scroll.txt	/*zs*
 zt	scroll.txt	/*zt*
 zv	fold.txt	/*zv*
+zw	spell.txt	/*zw*
 zx	fold.txt	/*zx*
 zz	scroll.txt	/*zz*
 {	motion.txt	/*{*
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 9290fbd..cf59f16 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 07
+" Last Change:	2005 Jun 08
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -407,7 +407,7 @@
   an 40.330 &Tools.-SEP1-						<Nop>
 endif
 
-" Tools.Spellsing Menu
+" Tools.Spelling Menu
 if has("spell")
   an 40.335.110 &Tools.&Spelling.&Spell\ Check\ On		:set spell<CR>
   an 40.335.120 &Tools.&Spelling.Spell\ Check\ &Off		:set nospell<CR>
diff --git a/src/screen.c b/src/screen.c
index ece886b..7db9b71 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3584,9 +3584,9 @@
 		}
 
 		/* Check spelling (unless at the end of the line).
-		 * Only do this when there is no syntax highlighting, there is
-		 * on @Spell cluster or the current syntax item contains the
-		 * @Spell cluster. */
+		 * Only do this when there is no syntax highlighting, the
+		 * @Spell cluster is not used or the current syntax item
+		 * contains the @Spell cluster. */
 		if (has_spell && v >= word_end)
 		{
 		    spell_attr = 0;
diff --git a/src/version.h b/src/version.h
index b1c0abb..c97e078 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 7)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 7, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 8)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 8, compiled "