diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index f397257..d04a6b4 100644
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -483,7 +483,7 @@
 			tab page.
 			Otherwise the number of the tab page the popup is
 			displayed on; when invalid the popup is not created
-			and an error is given. *E996*
+			and an error is given. *E997*
 	title		Text to be displayed above the first item in the
 			popup, on top of any border.  If there is no top
 			border one line of padding is added to put the title
diff --git a/src/popupwin.c b/src/popupwin.c
index f6da71d..16ec1a2 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -892,7 +892,7 @@
 	tp = find_tabpage(tabnr);
 	if (tp == NULL)
 	{
-	    semsg(_("E996: Tabpage not found: %d"), tabnr);
+	    semsg(_("E997: Tabpage not found: %d"), tabnr);
 	    return NULL;
 	}
     }
diff --git a/src/version.c b/src/version.c
index 58bfc1e..9d2f26c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1586,
+/**/
     1585,
 /**/
     1584,