diff --git a/src/dosinst.c b/src/dosinst.c
index 0ff8e69..6bc15fc 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -375,7 +375,7 @@
 
     /* First get $VIMRUNTIME.  If it's set, remove the tail. */
     vim = getenv("VIMRUNTIME");
-    if (vim != NULL && *vim != 0)
+    if (vim != NULL && *vim != 0 && strlen(vim) < BUFSIZE)
     {
 	strcpy(buf, vim);
 	remove_tail(buf);
diff --git a/src/version.c b/src/version.c
index c716154..b2ea5c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    809,
+/**/
     808,
 /**/
     807,