diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 1ddae27..14c0d8c 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -391,6 +391,7 @@
 	ClearErrors
 	# Remove everything but *.dll files.  Avoids that
 	# a lot remains when gvimext.dll cannot be deleted.
+	RMDir /r $0\autoload
 	RMDir /r $0\colors
 	RMDir /r $0\compiler
 	RMDir /r $0\doc
@@ -398,6 +399,7 @@
 	RMDir /r $0\indent
 	RMDir /r $0\macros
 	RMDir /r $0\plugin
+	RMDir /r $0\spell
 	RMDir /r $0\syntax
 	RMDir /r $0\tools
 	RMDir /r $0\tutor
diff --git a/src/version.c b/src/version.c
index e0f1edc..e38d2d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5,
+/**/
     4,
 /**/
     3,