diff --git a/src/os_unix.c b/src/os_unix.c
index f0a5621724..c78e7bf967 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -511,7 +511,7 @@ mch_inchar(
 		|| interrupted
 #endif
 		|| wait_time > 0
-		|| !did_start_blocking)
+		|| (wtime < 0 && !did_start_blocking))
 	    continue;
 
 	/* no character available or interrupted */
diff --git a/src/version.c b/src/version.c
index 7d2cf27584..3ebe8a6f9d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    512,
 /**/
     511,
 /**/