diff --git a/src/fileio.c b/src/fileio.c
index 47814fab9a..319c7ba975 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2101,6 +2101,10 @@ rewind_retry:
 		{
 		    for (p = ptr; p < ptr + size; ++p)
 		    {
+			/* Reset the carriage return counter. */
+			if (try_mac)
+			    try_mac = 1;
+
 			if (*p == NL)
 			{
 			    if (!try_unix
@@ -2110,6 +2114,8 @@ rewind_retry:
 				fileformat = EOL_UNIX;
 			    break;
 			}
+			else if (*p == CAR && try_mac)
+			    try_mac++;
 		    }
 
 		    /* Don't give in to EOL_UNIX if EOL_MAC is more likely */
@@ -2133,6 +2139,10 @@ rewind_retry:
 				fileformat = EOL_MAC;
 			}
 		    }
+		    else if (fileformat == EOL_UNKNOWN && try_mac == 1)
+			/* Looking for CR but found no end-of-line markers at
+			 * all: use the default format. */
+			fileformat = default_fileformat();
 		}
 
 		/* No NL found: may use Mac format */
diff --git a/src/version.c b/src/version.c
index 3d493b0545..0c2004116e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    635,
 /**/
     634,
 /**/