diff --git a/CHANGELOG.md b/CHANGELOG.md
index f94bdf3801b..044355e11ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#6190](https://github.com/influxdata/influxdb/pull/6190): Fix race on measurementFields.
 - [#6248](https://github.com/influxdata/influxdb/issues/6248): Panic using incorrectly quoted "queries" field key.
 - [#6257](https://github.com/influxdata/influxdb/issues/6257): CreateShardGroup was incrementing meta data index even when it was idempotent.
+- [#6223](https://github.com/influxdata/influxdb/issues/6223): Failure to start/run on Windows. Thanks @mvadu
 
 ## v0.12.0 [2016-04-05]
 
diff --git a/services/meta/client.go b/services/meta/client.go
index ca43252cfcf..41c46972f55 100644
--- a/services/meta/client.go
+++ b/services/meta/client.go
@@ -1002,6 +1002,11 @@ func snapshot(path string, data *Data) error {
 		return err
 	}
 
+	//close file handle before renaming to support Windows
+	if err = f.Close(); err != nil {
+		return err
+	}
+
 	return renameFile(tmpFile, file)
 }