diff --git a/metrics/init/metrics_daemon.conf b/metrics/init/metrics_daemon.conf
index 68edff4..9b1e2a5 100644
--- a/metrics/init/metrics_daemon.conf
+++ b/metrics/init/metrics_daemon.conf
@@ -11,5 +11,10 @@
 stop on stopping system-services
 respawn
 
+pre-start script
+  # Make the directory, but don't die on error.  Let someone else complain.
+  mkdir -p /var/lib/metrics || :
+end script
+
 expect fork
 exec metrics_daemon
diff --git a/metrics/persistent_integer.cc b/metrics/persistent_integer.cc
index 658c9d3..d4ef8b2 100644
--- a/metrics/persistent_integer.cc
+++ b/metrics/persistent_integer.cc
@@ -11,10 +11,14 @@
 
 #include "metrics_library.h"
 
-namespace chromeos_metrics {
+namespace {
 
 // The directory for the persistent storage.
-const char* const kBackingFilesDirectory = "/var/log/metrics/";
+const char kBackingFilesDirectory[] = "/var/lib/metrics/";
+
+}
+
+namespace chromeos_metrics {
 
 // Static class member instantiation.
 bool PersistentInteger::testing_ = false;