diff --git a/src/option.c b/src/option.c
index 616f9a3..8a706af 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4017,6 +4017,15 @@
     }
 #endif
 
+    if (bufempty())
+    {
+	int idx_ffs = findoption((char_u *)"ffs");
+
+	/* Apply the first entry of 'fileformats' to the initial buffer. */
+	if (idx_ffs >= 0 && (options[idx_ffs].flags & P_WAS_SET))
+	    set_fileformat(default_fileformat(), OPT_LOCAL);
+    }
+
 #ifdef FEAT_TITLE
     set_title_defaults();
 #endif
diff --git a/src/version.c b/src/version.c
index 03a3081..9136583 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1619,
+/**/
     1618,
 /**/
     1617,