diff --git a/src/version.c b/src/version.c
index 884d3a5..caaf968 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    658,
+/**/
     657,
 /**/
     656,
diff --git a/src/vim.h b/src/vim.h
index 17cc7b8..4a77dec 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -163,7 +163,8 @@
  */
 #include "feature.h"
 
-#if defined(MACOS_X_DARWIN) && !defined(FEAT_CLIPBOARD)
+#if defined(MACOS_X_DARWIN) && defined(FEAT_NORMAL) \
+	&& !defined(FEAT_CLIPBOARD)
 # define FEAT_CLIPBOARD
 #endif