diff --git a/src/qtgui/main.cpp b/src/qtgui/main.cpp
index 85242284..ebb6ba46 100644
--- a/src/qtgui/main.cpp
+++ b/src/qtgui/main.cpp
@@ -81,7 +81,7 @@ void deleteAllTempFiles()
     Uncomp::clearcache();
 }
 
-Rcl::Db *rcldb;
+std::shared_ptr<Rcl::Db> rcldb;
 int recollNeedsExit;
 RclMain *mainWindow;
 
@@ -96,8 +96,7 @@ bool maybeOpenDb(string &reason, bool force, bool *maindberror)
     LOGDEB2("maybeOpenDb: force " << force << "\n");
 
     if (force) {
-        delete rcldb;
-        rcldb = new Rcl::Db(theconfig);
+        rcldb = std::shared_ptr<Rcl::Db>(new Rcl::Db(theconfig));
     }
     rcldb->rmQueryDb("");
     for (const auto& dbdir : prefs.activeExtraDbs) {
@@ -142,10 +141,11 @@ bool getStemLangs(vector<string>& vlangs)
     }
 }
 
+// This is never called because we _Exit() in rclmain_w.cpp
 static void recollCleanup()
 {
     LOGDEB2("recollCleanup: closing database\n" );
-    deleteZ(rcldb);
+    rcldb.reset();
     deleteZ(theconfig);
 
     deleteAllTempFiles();
diff --git a/src/qtgui/preview_w.cpp b/src/qtgui/preview_w.cpp
index c1cf0dfb..cebc2d41 100644
--- a/src/qtgui/preview_w.cpp
+++ b/src/qtgui/preview_w.cpp
@@ -859,7 +859,7 @@ bool Preview::loadDocInCurrentTab(const Rcl::Doc &idoc, int docnum)
 
 
     // Enter document in document history
-    historyEnterDoc(rcldb, g_dynconf, idoc);
+    historyEnterDoc(rcldb.get(), g_dynconf, idoc);
 
     editor->setFocus();
     emit(previewExposed(this, m_searchId, docnum));
diff --git a/src/qtgui/rclm_view.cpp b/src/qtgui/rclm_view.cpp
index b43786a1..204b44b4 100644
--- a/src/qtgui/rclm_view.cpp
+++ b/src/qtgui/rclm_view.cpp
@@ -67,10 +67,10 @@ void RclMain::viewUrl()
 	return;
 
     // StartNativeViewer needs a db source to call getEnclosing() on.
-    Rcl::Query *query = new Rcl::Query(rcldb);
-    DocSequenceDb *src = 
-	new DocSequenceDb(std::shared_ptr<Rcl::Query>(query), "", 
-			  std::shared_ptr<Rcl::SearchData>(new Rcl::SearchData));
+    Rcl::Query *query = new Rcl::Query(rcldb.get());
+    DocSequenceDb *src = new DocSequenceDb(
+        rcldb, std::shared_ptr<Rcl::Query>(query), "", 
+        std::shared_ptr<Rcl::SearchData>(new Rcl::SearchData));
     m_source = std::shared_ptr<DocSequence>(src);
 
 
@@ -458,7 +458,7 @@ void RclMain::execViewer(const map<string, string>& subs, bool enterHistory,
     }
 
     if (enterHistory)
-	historyEnterDoc(rcldb, g_dynconf, doc);
+	historyEnterDoc(rcldb.get(), g_dynconf, doc);
     
     // Do the zeitgeist thing
     zg_send_event(ZGSEND_OPEN, doc);
diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
index 41f04865..97a569c6 100644
--- a/src/qtgui/rclmain_w.cpp
+++ b/src/qtgui/rclmain_w.cpp
@@ -736,12 +736,12 @@ void RclMain::startSearch(std::shared_ptr<Rcl::SearchData> sdata, bool issimple)
         rcldb->setSynGroupsFile("");
     }
 
-    Rcl::Query *query = new Rcl::Query(rcldb);
+    Rcl::Query *query = new Rcl::Query(rcldb.get());
     query->setCollapseDuplicates(prefs.collapseDuplicates);
 
     curPreview = 0;
     DocSequenceDb *src = 
-	new DocSequenceDb(std::shared_ptr<Rcl::Query>(query), 
+	new DocSequenceDb(rcldb, std::shared_ptr<Rcl::Query>(query), 
 			  string(tr("Query results").toUtf8()), sdata);
     src->setAbstractParams(prefs.queryBuildAbstract, 
                            prefs.queryReplaceAbstract);
diff --git a/src/qtgui/recoll.h b/src/qtgui/recoll.h
index b9994c79..96f6101a 100644
--- a/src/qtgui/recoll.h
+++ b/src/qtgui/recoll.h
@@ -18,6 +18,7 @@
 #define _RECOLL_H_INCLUDED_
 
 #include <string>
+#include <memory>
 
 #include "rclconfig.h"
 #include "rcldb.h"
@@ -40,7 +41,7 @@ extern TempFile *rememberTempFile(TempFile);
 extern void forgetTempFile(string &fn);
 extern void deleteAllTempFiles();
 
-extern Rcl::Db *rcldb;
+extern std::shared_ptr<Rcl::Db> rcldb;
 extern int recollNeedsExit;
 extern void startManual(const string& helpindex);
 
diff --git a/src/qtgui/spell_w.cpp b/src/qtgui/spell_w.cpp
index 0f9834b9..80b5e358 100644
--- a/src/qtgui/spell_w.cpp
+++ b/src/qtgui/spell_w.cpp
@@ -338,7 +338,7 @@ void SpellW::showStats()
 	string q = string("mime:") + *it;
 	Rcl::SearchData *sd = wasaStringToRcl(theconfig, "", q, reason);
 	std::shared_ptr<Rcl::SearchData> rq(sd);
-	Rcl::Query query(rcldb);
+	Rcl::Query query(rcldb.get());
 	if (!query.setQuery(rq)) {
 	    LOGERR("Query setup failed: "  << (query.getReason()) << "" );
 	    return;
diff --git a/src/query/docseq.cpp b/src/query/docseq.cpp
index b475bb62..55c9ddd2 100644
--- a/src/query/docseq.cpp
+++ b/src/query/docseq.cpp
@@ -41,8 +41,8 @@ int DocSequence::getSeqSlice(int offs, int cnt, vector<ResListEntry>& result)
 
 bool DocSequence::getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc) 
 {
-    Rcl::Db *db = getDb();
-    if (db == 0) {
+    std::shared_ptr<Rcl::Db> db = getDb();
+    if (!db) {
 	LOGERR("DocSequence::getEnclosing: no db\n" );
 	return false;
     }
diff --git a/src/query/docseq.h b/src/query/docseq.h
index 80eeaea3..7c590488 100644
--- a/src/query/docseq.h
+++ b/src/query/docseq.h
@@ -166,7 +166,7 @@ class DocSequence {
 
 protected:
     friend class DocSeqModifier;
-    virtual Rcl::Db *getDb() = 0;
+    virtual std::shared_ptr<Rcl::Db> getDb() = 0;
     static std::mutex o_dblock;
     static std::string o_sort_trans;
     static std::string o_filt_trans;
@@ -247,8 +247,7 @@ public:
     }
 
 protected:
-    virtual Rcl::Db *getDb()
-    {
+    virtual std::shared_ptr<Rcl::Db> getDb() {
 	if (!m_seq)
 	    return 0;
 	return m_seq->getDb();
diff --git a/src/query/docseqdb.cpp b/src/query/docseqdb.cpp
index ec2ff2b7..2343e56e 100644
--- a/src/query/docseqdb.cpp
+++ b/src/query/docseqdb.cpp
@@ -28,9 +28,10 @@
 
 using std::list;
 
-DocSequenceDb::DocSequenceDb(std::shared_ptr<Rcl::Query> q, const string &t, 
+DocSequenceDb::DocSequenceDb(std::shared_ptr<Rcl::Db> db,
+                             std::shared_ptr<Rcl::Query> q, const string &t, 
 			     std::shared_ptr<Rcl::SearchData> sdata) 
-    : DocSequence(t), m_q(q), m_sdata(sdata), m_fsdata(sdata),
+    : DocSequence(t), m_db(db), m_q(q), m_sdata(sdata), m_fsdata(sdata),
       m_rescnt(-1), 
       m_queryBuildAbstract(true),
       m_queryReplaceAbstract(false),
@@ -131,11 +132,6 @@ int DocSequenceDb::getFirstMatchPage(Rcl::Doc &doc, string& term)
     return -1;
 }
 
-Rcl::Db *DocSequenceDb::getDb()
-{
-    return m_q ? m_q->whatDb() : 0;
-}
-
 list<string> DocSequenceDb::expand(Rcl::Doc &doc)
 {
     std::unique_lock<std::mutex> locker(o_dblock);
diff --git a/src/query/docseqdb.h b/src/query/docseqdb.h
index ddae0deb..b42327d9 100644
--- a/src/query/docseqdb.h
+++ b/src/query/docseqdb.h
@@ -25,7 +25,8 @@
 /** A DocSequence from a Db query */
 class DocSequenceDb : public DocSequence {
  public:
-    DocSequenceDb(std::shared_ptr<Rcl::Query> q, const string &t, 
+    DocSequenceDb(std::shared_ptr<Rcl::Db> db,
+                  std::shared_ptr<Rcl::Query> q, const string &t, 
 		  std::shared_ptr<Rcl::SearchData> sdata);
     virtual ~DocSequenceDb() {}
     virtual bool getDoc(int num, Rcl::Doc &doc, string * = 0);
@@ -58,8 +59,11 @@ class DocSequenceDb : public DocSequence {
     virtual string title();
 
 protected:
-    virtual Rcl::Db *getDb();
+    virtual std::shared_ptr<Rcl::Db> getDb() {
+        return m_db;
+    }
 private:
+    std::shared_ptr<Rcl::Db>         m_db;
     std::shared_ptr<Rcl::Query>      m_q;
     std::shared_ptr<Rcl::SearchData> m_sdata;
     std::shared_ptr<Rcl::SearchData> m_fsdata; // Filtered 
diff --git a/src/query/docseqdocs.h b/src/query/docseqdocs.h
index c766c87c..ed0cf526 100644
--- a/src/query/docseqdocs.h
+++ b/src/query/docseqdocs.h
@@ -17,6 +17,8 @@
 #ifndef _DOCSEQDOCS_H_INCLUDED_
 #define _DOCSEQDOCS_H_INCLUDED_
 
+#include <memory>
+
 #include "docseq.h"
 #include "rcldoc.h"
 
@@ -27,16 +29,13 @@ namespace Rcl {
 /** A DocSequence that's just built from a bunch of docs */
 class DocSequenceDocs : public DocSequence {
  public:
-    DocSequenceDocs(Rcl::Db *d, const std::vector<Rcl::Doc> docs, 
-		    const string &t) 
-	: DocSequence(t), m_db(d), m_docs(docs)
-    {
+    DocSequenceDocs(std::shared_ptr<Rcl::Db> d,
+                    const std::vector<Rcl::Doc> docs, const string &t) 
+	: DocSequence(t), m_db(d), m_docs(docs) {
     }
-    virtual ~DocSequenceDocs() 
-    {
+    virtual ~DocSequenceDocs() {
     }
-    virtual bool getDoc(int num, Rcl::Doc &doc, string *sh = 0)
-    {
+    virtual bool getDoc(int num, Rcl::Doc &doc, string *sh = 0) {
 	if (sh)
 	    *sh = string();
 	if (num < 0 || num >= int(m_docs.size()))
@@ -44,25 +43,21 @@ class DocSequenceDocs : public DocSequence {
 	doc = m_docs[num];
 	return true;
     }
-    virtual int getResCnt()
-    {
+    virtual int getResCnt() {
 	return m_docs.size();
     }
-    virtual string getDescription() 
-    {
+    virtual string getDescription() {
 	return m_description;
     }
-    void setDescription(const string& desc) 
-    {
+    void setDescription(const string& desc) {
 	m_description = desc;
     }
 protected:
-    virtual Rcl::Db *getDb()
-    {
+    virtual std::shared_ptr<Rcl::Db> getDb() {
 	return m_db;
     }
  private:
-    Rcl::Db    *m_db;
+    std::shared_ptr<Rcl::Db> m_db;
     string      m_description;
     std::vector<Rcl::Doc> m_docs;
 };
diff --git a/src/query/docseqhist.cpp b/src/query/docseqhist.cpp
index 18cd7c56..0ac0c05d 100644
--- a/src/query/docseqhist.cpp
+++ b/src/query/docseqhist.cpp
@@ -159,11 +159,6 @@ bool DocSequenceHistory::getDoc(int num, Rcl::Doc &doc, string *sh)
     return ret;
 }
 
-Rcl::Db *DocSequenceHistory::getDb()
-{
-    return m_db;
-}
-
 int DocSequenceHistory::getResCnt()
 {	
     if (m_history.empty())
diff --git a/src/query/docseqhist.h b/src/query/docseqhist.h
index 1a6c6974..7ab7edb0 100644
--- a/src/query/docseqhist.h
+++ b/src/query/docseqhist.h
@@ -19,6 +19,7 @@
 #include <time.h>
 
 #include <vector>
+#include <memory>
 
 #include "docseq.h"
 #include "dynconf.h"
@@ -47,8 +48,9 @@ class RclDHistoryEntry : public DynConfEntry {
  *  metadata for an url key */
 class DocSequenceHistory : public DocSequence {
  public:
-    DocSequenceHistory(Rcl::Db *d, RclDynConf *h, const std::string &t) 
-	: DocSequence(t), m_db(d), m_hist(h) {}
+    DocSequenceHistory(std::shared_ptr<Rcl::Db> db, RclDynConf *h,
+                       const std::string &t) 
+	: DocSequence(t), m_db(db), m_hist(h) {}
     virtual ~DocSequenceHistory() {}
 
     virtual bool getDoc(int num, Rcl::Doc &doc, std::string *sh = 0);
@@ -56,9 +58,11 @@ class DocSequenceHistory : public DocSequence {
     virtual std::string getDescription() {return m_description;}
     void setDescription(const std::string& desc) {m_description = desc;}
 protected:
-    virtual Rcl::Db *getDb();
+    virtual std::shared_ptr<Rcl::Db> getDb() {
+        return m_db;
+    }
 private:
-    Rcl::Db    *m_db;
+    std::shared_ptr<Rcl::Db> m_db;
     RclDynConf *m_hist;
     time_t      m_prevtime{-1};
     std::string m_description; // This is just an nls translated 'doc history'