1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 2992ea45cf..4636b94371 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -76,7 +76,6 @@ namespace broker {
 Broker::Options::Options(const std::string& name) :
     qpid::Options(name),
     noDataDir(0),
-    dataDir("/var/lib/qpidd"),
     port(DEFAULT_PORT),
     workerThreads(5),
     maxConnections(500),
@@ -90,6 +89,14 @@ Broker::Options::Options(const std::string& name) :
 {
     int c = sys::SystemInfo::concurrency();
     workerThreads=c+1;
+    char *home = ::getenv("HOME");
+
+    if (home == 0)
+        home = "/tmp";
+
+    dataDir += home;
+    dataDir += "/.qpidd";
+
     addOptions()
         ("data-dir", optValue(dataDir,"DIR"), "Directory to contain persistent data generated by the broker")
         ("no-data-dir", optValue(noDataDir), "Don't use a data directory.  No persistent configuration will be loaded or stored")