diff --git a/src/libstore/db.cc b/src/libstore/db.cc
index 057371ef50..c89d6b197d 100644
--- a/src/libstore/db.cc
+++ b/src/libstore/db.cc
@@ -261,7 +261,9 @@ void Database::close()
             delete db;
         }
 
-//         env->txn_checkpoint(0, 0, 0);
+        /* Do a checkpoint every 128 kilobytes, or every 5 minutes. */
+        env->txn_checkpoint(128, 5, 0);
+        
         env->close(0);
 
     } catch (DbException e) { rethrow(e); }