diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index fc700c5..42890ca 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -224,6 +224,10 @@
                 PLOG(ERROR) << "Unable to move upgraded key to location: " << kmKeyPath;
                 return KeymasterOperation();
             }
+            if (!android::vold::FsyncDirectory(dir)) {
+                LOG(ERROR) << "Key dir sync failed: " << dir;
+                return KeymasterOperation();
+            }
             if (!keymaster.deleteKey(kmKey)) {
                 LOG(ERROR) << "Key deletion failed during upgrade, continuing anyway: " << dir;
             }