diff --git a/src/eval.c b/src/eval.c
index cd7ce25..1516fe5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -933,6 +933,11 @@
     for (i = 0; i < VV_LEN; ++i)
     {
 	p = &vimvars[i];
+	if (STRLEN(p->vv_name) > 16)
+	{
+	    EMSG("INTERNAL: name too long, increase size of dictitem16_T");
+	    getout(1);
+	}
 	STRCPY(p->vv_di.di_key, p->vv_name);
 	if (p->vv_flags & VV_RO)
 	    p->vv_di.di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
diff --git a/src/version.c b/src/version.c
index 4778bfe..26928e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1681,
+/**/
     1680,
 /**/
     1679,