diff --git a/NEWS b/NEWS
index 22920348b..5ac89971e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ ver 0.19.9 (not yet released)
 * fix build failure with uClibc
 * fix build failure on non-POSIX operating systems
 * fix dependency issue on parallel Android build
+* fix database/state file saving on Windows
 
 ver 0.19.8 (2015/01/14)
 * input
diff --git a/src/fs/io/FileOutputStream.cxx b/src/fs/io/FileOutputStream.cxx
index dc4456d1f..0eff8b5f0 100644
--- a/src/fs/io/FileOutputStream.cxx
+++ b/src/fs/io/FileOutputStream.cxx
@@ -62,6 +62,7 @@ FileOutputStream::Commit(gcc_unused Error &error)
 	assert(IsDefined());
 
 	CloseHandle(handle);
+	handle = INVALID_HANDLE_VALUE;
 	return true;
 }
 
@@ -71,6 +72,7 @@ FileOutputStream::Cancel()
 	assert(IsDefined());
 
 	CloseHandle(handle);
+	handle = INVALID_HANDLE_VALUE;
 	RemoveFile(path);
 }