diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 4b2ea10be..d472450ed 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -192,6 +192,13 @@ do_mkfs (const char *fstype, const char *device, int blocksize,
   }
 
   free (err);
+
+  /* Workaround for RHBZ#863978, possibly in kernel 3.7.0.  Can be
+   * fixed when we work out what's going on upstream.
+   */
+  if (STREQ (fstype, "btrfs"))
+    sync_disks ();
+
   return 0;
 }