diff --git a/src/option.c b/src/option.c
index 308d7a8..97e45cd 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7377,7 +7377,8 @@
 check_clipboard_option()
 {
     int		new_unnamed = 0;
-    int		new_autoselect = FALSE;
+    int		new_autoselect_star = FALSE;
+    int		new_autoselect_plus = FALSE;
     int		new_autoselectml = FALSE;
     int		new_html = FALSE;
     regprog_T	*new_exclude_prog = NULL;
@@ -7398,13 +7399,19 @@
 	    p += 11;
 	}
 	else if (STRNCMP(p, "autoselect", 10) == 0
-					&& (p[10] == ',' || p[10] == NUL))
+					    && (p[10] == ',' || p[10] == NUL))
 	{
-	    new_autoselect = TRUE;
+	    new_autoselect_star = TRUE;
 	    p += 10;
 	}
+	else if (STRNCMP(p, "autoselectplus", 14) == 0
+					    && (p[14] == ',' || p[14] == NUL))
+	{
+	    new_autoselect_plus = TRUE;
+	    p += 14;
+	}
 	else if (STRNCMP(p, "autoselectml", 12) == 0
-					&& (p[12] == ',' || p[12] == NUL))
+					    && (p[12] == ',' || p[12] == NUL))
 	{
 	    new_autoselectml = TRUE;
 	    p += 12;
@@ -7433,7 +7440,8 @@
     if (errmsg == NULL)
     {
 	clip_unnamed = new_unnamed;
-	clip_autoselect = new_autoselect;
+	clip_autoselect_star = new_autoselect_star;
+	clip_autoselect_plus = new_autoselect_plus;
 	clip_autoselectml = new_autoselectml;
 	clip_html = new_html;
 	vim_free(clip_exclude_prog);
diff --git a/src/version.c b/src/version.c
index 640d419..9c03d60 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    599,
+/**/
     598,
 /**/
     597,