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