diff --git a/ChangeLog b/ChangeLog
index 92bc63e9..81713c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,11 @@
 	Rewritten Signature::save()
 	* src/Signature.cc
 
+2009-07-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Rewritten RequestGroupMan::saveServerStat()
+	* src/RequestGroupMan.cc
+
 2009-07-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Rewritten stream error handling
diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc
index 06f4273c..abada48b 100644
--- a/src/RequestGroupMan.cc
+++ b/src/RequestGroupMan.cc
@@ -763,21 +763,25 @@ bool RequestGroupMan::saveServerStat(const std::string& filename) const
 {
   std::string tempfile = filename;
   tempfile += "__temp";
-  std::ofstream out(tempfile.c_str(), std::ios::binary);
-  if(!out) {
-    _logger->error(MSG_OPENING_WRITABLE_SERVER_STAT_FILE_FAILED,
-		   tempfile.c_str());
-    return false;
-  }
-  if (_serverStatMan->save(out)) {
-    out.close();
-    if (File(tempfile).renameTo(filename)) {
-      _logger->notice(MSG_SERVER_STAT_SAVED, filename.c_str());
-      return true;
+  {
+    std::ofstream out(tempfile.c_str(), std::ios::binary);
+    if(!out) {
+      _logger->error(MSG_OPENING_WRITABLE_SERVER_STAT_FILE_FAILED,
+		     filename.c_str());
+      return false;
+    }
+    if(!_serverStatMan->save(out)) {
+      _logger->error(MSG_WRITING_SERVER_STAT_FILE_FAILED, filename.c_str());
+      return false;
     }
   }
-  _logger->error(MSG_WRITING_SERVER_STAT_FILE_FAILED, filename.c_str());
-  return false;
+  if(File(tempfile).renameTo(filename)) {
+    _logger->notice(MSG_SERVER_STAT_SAVED, filename.c_str());
+    return true;
+  } else {
+    _logger->error(MSG_WRITING_SERVER_STAT_FILE_FAILED, filename.c_str());
+    return false;
+  }
 }
 
 void RequestGroupMan::removeStaleServerStat(time_t timeout)