diff --git a/src/undo.c b/src/undo.c
index 8141301..033fa6e 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1786,6 +1786,11 @@
 	write_ok = FALSE;
 #endif
 
+#if defined(UNIX) && defined(HAVE_FSYNC)
+    if (p_fs && fflush(fp) == 0 && vim_fsync(fd) != 0)
+	write_ok = FALSE;
+#endif
+
 write_error:
     fclose(fp);
     if (!write_ok)
diff --git a/src/version.c b/src/version.c
index 2125972..31f0015 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3509,
+/**/
     3508,
 /**/
     3507,