--- a/src/Makefile
+++ b/src/Makefile
@@ -1840,15 +1840,12 @@ installtutor: $(DEST_VIM) $(DEST_RT) $(D
 	-$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
 	chmod $(HELPMOD) $(DEST_TUTOR)/*
 
-# Install the spell files, if they exist.
+# Install the spell files, if they exist.  This assumes at least the English
+# spell file is there.
 installspell: $(DEST_VIM) $(DEST_RT) $(DEST_SPELL)
 	if test -f $(SPELLSOURCE)/en.latin1.spl; then \
-	  $(INSTALL_DATA) $(SPELLSOURCE)/*.spl $(DEST_SPELL); \
-	  chmod $(HELPMOD) $(DEST_SPELL)/*.spl; \
-	fi
-	if test -f $(SPELLSOURCE)/en.utf-8.spl; then \
-	  $(INSTALL_DATA) $(SPELLSOURCE)/*.spl $(DEST_SPELL); \
-	  chmod $(HELPMOD) $(DEST_SPELL)/*.spl; \
+	  $(INSTALL_DATA) $(SPELLSOURCE)/*.spl *.vim $(DEST_SPELL); \
+	  chmod $(HELPMOD) $(DEST_SPELL)/*.spl *.vim; \
 	fi
 
 # install helper program xxd