diff --git a/ChangeLog b/ChangeLog
index bcd7d3a7e..4fe09c86f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-06-18  Brian Matherly  <brian@gramps-project.org>
+	* src/DbManager.py: make path recursive. Make default db dir consistent.
+
 2007-06-18  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_GrampsDBDir.py: revision control check in
 	* src/DbManager.py: revision control check in
diff --git a/src/DbManager.py b/src/DbManager.py
index dca8ad786..a6160f013 100644
--- a/src/DbManager.py
+++ b/src/DbManager.py
@@ -73,7 +73,6 @@ import Config
 # constants
 #
 #-------------------------------------------------------------------------
-DEFAULT_DIR = os.path.join(const.home_dir, "grampsdb")
 DEFAULT_TITLE = _("Family Tree")
 NAME_FILE     = "name.txt"
 META_NAME     = "meta_data.db"
@@ -257,7 +256,7 @@ class DbManager:
 
         try:
             if not os.path.isdir(dbdir):
-                os.mkdir(dbdir)
+                os.makedirs(dbdir)
         except (IOError, OSError), msg:
             LOG.error(_("Could not make database directory: ") + str(msg))
 
@@ -479,7 +478,8 @@ def find_next_db_dir():
     """
     while True:
         base = "%x" % int(time.time())
-        new_path = os.path.join(DEFAULT_DIR, base)
+        dbdir = os.path.expanduser(Config.get(Config.DATABASE_PATH))
+        new_path = os.path.join(dbdir, base)
         if not os.path.isdir(new_path):
             break
     return new_path