diff --git a/src/register.c b/src/register.c
index c9bc752240..3ca425b450 100644
--- a/src/register.c
+++ b/src/register.c
@@ -198,6 +198,7 @@ valid_yank_reg(
 #endif
 							)
 	return TRUE;
+#ifndef FEAT_CLIPBOARD
     // clipboard support not enabled in this build
     else if (regname == '*' || regname == '+')
     {
@@ -205,6 +206,7 @@ valid_yank_reg(
 	msg_warn_missing_clipboard();
 	return FALSE;
     }
+#endif
     return FALSE;
 }
 
diff --git a/src/version.c b/src/version.c
index 5c775b0304..bb0de39e13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    858,
 /**/
     857,
 /**/