diff --git a/src/option.c b/src/option.c
index b4beef1c81..51e6a34ea8 100644
--- a/src/option.c
+++ b/src/option.c
@@ -10624,6 +10624,9 @@ save_file_ff(buf)
 file_ff_differs(buf)
     buf_T	*buf;
 {
+    /* In a buffer that was never loaded the options are not valid. */
+    if (buf->b_flags & BF_NEVERLOADED)
+	return FALSE;
     if ((buf->b_flags & BF_NEW)
 	    && buf->b_ml.ml_line_count == 1
 	    && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
diff --git a/src/version.c b/src/version.c
index 082ce127f4..98ecaf88be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    33,
 /**/
     32,
 /**/