diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 6eca2d5b..db19b488 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(baloosearch)
 add_subdirectory(balooshow)
 add_subdirectory(balooctl)
+add_subdirectory(baloodb)
diff --git a/src/tools/baloodb/CMakeLists.txt b/src/tools/baloodb/CMakeLists.txt
new file mode 100644
index 00000000..ea5cd32c
--- /dev/null
+++ b/src/tools/baloodb/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"baloodb5\")
+
+set(SRCS main.cpp)
+
+add_executable(baloodb ${SRCS})
+ecm_mark_nongui_executable(baloodb)
+target_compile_definitions(baloodb PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
+
+target_link_libraries(baloodb
+    KF5::Baloo
+    KF5::BalooEngine
+    KF5::CoreAddons
+    KF5::I18n
+)
+
+install(TARGETS baloodb ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/tools/baloodb/Messages.sh b/src/tools/baloodb/Messages.sh
new file mode 100644
index 00000000..0fe94863
--- /dev/null
+++ b/src/tools/baloodb/Messages.sh
@@ -0,0 +1,2 @@
+#! /usr/bin/env bash
+$XGETTEXT *.cpp -o $podir/baloodb5.pot
diff --git a/src/tools/baloodb/main.cpp b/src/tools/baloodb/main.cpp
new file mode 100644
index 00000000..60b684c0
--- /dev/null
+++ b/src/tools/baloodb/main.cpp
@@ -0,0 +1,262 @@
+/*
+ * <one line to give the library's name and an idea of what it does.>
+ * Copyright 2018  Michael Heidelbach <heidelbach@web.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "global.h"
+#include "databasesanitizer.h"
+
+#include <KAboutData>
+#include <KLocalizedString>
+
+#include <QCoreApplication>
+#include <QCommandLineOption>
+#include <QCommandLineParser>
+#include <QStandardPaths>
+#include <QTextStream>
+#include <QList>
+#include <QElapsedTimer>
+
+using namespace Baloo;
+
+struct Command {
+    const QString name;
+    const QString description;
+    const QStringList args;
+    const QStringList options;
+};
+
+const auto options = QList<QCommandLineOption>{
+    QCommandLineOption{
+        QStringList{QStringLiteral("i"), QStringLiteral("device-id")},
+        i18n("Filter by device id."
+        "\n0 (default) does not filter and everything is printed."
+        "\nPositive numbers are including filters printing only the mentioned device id."
+        "\nNegative numbers are excluding filters printing everything but the mentioned device id."
+        "\nMay be given multiple times."),
+        i18n("integer"),
+        0
+    },
+    QCommandLineOption{
+        QStringList{QStringLiteral("D"), QStringLiteral("dry-run")},
+        i18n("Print results of a prune operation, but do not change anything."
+        "\nOnly applies to \"%1\" command", QStringLiteral("prune"))
+    },
+    QCommandLineOption{
+        QStringList{QStringLiteral("m"), QStringLiteral("missing-only")}, 
+        i18n("List only inaccessible entries.\nOnly applies to \"%1\"", QStringLiteral("list"))
+    }
+};
+
+const auto commands = std::vector<Command>{
+    Command{
+        QStringLiteral("list"), 
+        i18n("List database contents. Use a regular expression as argument to filter output"),
+        QStringList{
+            QStringLiteral("pattern")
+        },
+        QStringList{
+            QStringLiteral("missing-only"),
+            QStringLiteral("device-id")
+        }
+    },
+    /*TODO:
+    Command{
+        QStringLiteral("check"), 
+        i18n("Check database contents. "
+        "Beware this may take very long to execute"),
+        QStringList{},
+        QStringList{}
+    },
+    */
+    /*TODO:
+    Command{
+        QStringLiteral("prune"), 
+        i18n("Remove stale database entries"),
+        QStringList{
+            QStringLiteral("pattern")
+        },
+        QStringList{
+            QStringLiteral("dry-run"),
+            QStringLiteral("device-id")
+        }
+    },
+    */
+    Command{
+        QStringLiteral("devices"), 
+        i18n("List devices"),
+        QStringList{},
+        QStringList{QStringLiteral("missing-only")}
+    }
+};
+
+const QStringList allowedCommands()
+{
+    QStringList names;
+    for (const auto& c : commands) {
+        names.append(c.name);
+    }
+    return names;
+}
+const QStringList getOptions(const QString& name) 
+{
+    for (const auto& c : commands) {
+        if (c.name == name) {
+            return c.options;
+        }
+    }
+    return QStringList();
+}
+QString createDescription() 
+{
+    QStringList allowedcommands;
+    for (const auto& c: commands) {
+        auto options = getOptions(c.name);
+        const QString optionStr = options.isEmpty()
+            ? QString()
+            : QStringLiteral(" [--%1]").arg(options.join(QLatin1Literal("] [--")));
+            
+        QString argumentStr;
+        if (!c.args.isEmpty() ) {
+            argumentStr = QStringLiteral(" [%1]").arg(c.args.join(QStringLiteral("] [")));
+        }
+
+        const QString commandStr = QStringLiteral("%1%2%3")
+            .arg(c.name)
+            .arg(optionStr)
+            .arg(argumentStr);
+            
+        const QString str = QStringLiteral("%1 %2")
+            .arg(commandStr, -48)
+            .arg(c.description);
+            
+        allowedcommands.append(str);
+    }
+    const QString allCommandsStr = allowedcommands.join(QStringLiteral("\n    "));
+    return i18n("\n\nCommands:\n    %1", allCommandsStr);
+}
+
+int main(int argc, char* argv[])
+{
+    QCoreApplication app(argc, argv);
+    KAboutData aboutData(QStringLiteral("baloodb"),
+                         i18n("Baloo Database Sanitizer"),
+                         PROJECT_VERSION,
+                         i18n("The Baloo Database Lister & Sanitizer"),
+                         KAboutLicense::GPL,
+                         i18n("(c) 2018, Michael Heidelbach"));
+    aboutData.addAuthor(i18n("Michael Heidelbach"), i18n("Maintainer"), QStringLiteral("ottwolt@gmail.com"));
+    KAboutData::setApplicationData(aboutData);
+    
+    QCommandLineParser parser;
+    parser.addOptions(options);
+    parser.addPositionalArgument(QStringLiteral("command"), 
+        i18n("The command to execute"), 
+        allowedCommands().join(QStringLiteral("|"))
+    );
+    parser.addPositionalArgument(QStringLiteral("pattern"), 
+        i18nc("Command", "A regular expression applied to the URL of database items"
+            "\nExample: %1"
+            , "baloodb list '^/media/videos/series'"
+        )
+    );
+    parser.setApplicationDescription(createDescription());
+    parser.addVersionOption();
+    parser.addHelpOption();
+
+    parser.process(app);
+    if (parser.positionalArguments().isEmpty()) {
+        qDebug() << "No command";
+        parser.showHelp(1);
+    }
+    
+    auto args = parser.positionalArguments();
+    auto command = args.at(0);
+    args.removeFirst();
+    
+    if(!allowedCommands().contains(command)) {
+        qDebug() << "Unknown command" << command;
+        parser.showHelp(1);
+    }
+    
+    const auto optNames = parser.optionNames();
+    const auto allowedOptions = getOptions(command);
+    
+    QVector<qint64> deviceIds;
+    for (const auto& dev : parser.values(QStringLiteral("device-id"))) {
+        deviceIds.append(dev.toInt());
+    }
+    const bool missingOnly = parser.isSet(QStringLiteral("missing-only"));
+    const QString pattern = args.isEmpty()
+        ? QString()
+        : args.at(0);
+    const QSharedPointer<QRegularExpression> urlFilter(pattern.isEmpty() 
+        ? nullptr 
+        : new QRegularExpression{pattern});
+
+    auto db = globalDatabaseInstance();
+    QTextStream err(stderr);
+    QElapsedTimer timer;
+    timer.start();
+
+    if (command == QStringLiteral("list")) {
+        if (!db->open(Database::ReadOnlyDatabase)) {
+            err << i18n("Baloo Index could not be opened") << endl;
+            return 1;
+        }
+        DatabaseSanitizer san(db, Transaction::ReadOnly);
+        err << i18n("Listing database contents...") << endl;
+        san.printList(deviceIds, missingOnly, urlFilter);
+    } else if (command == QStringLiteral("devices")) {
+        if (!db->open(Database::ReadOnlyDatabase)) {
+            err << i18n("Baloo Index could not be opened") << endl;
+            return 1;
+        }
+        DatabaseSanitizer san(db, Transaction::ReadOnly);
+        err << i18n("Listing database contents...") << endl;
+        san.printDevices(deviceIds);
+        
+    } else if (command == QStringLiteral("clean")) {
+        /* TODO: add prune command */
+        parser.showHelp(1);
+        
+    } else if (command == QStringLiteral("check")) {
+        parser.showHelp(1);
+       /* TODO: After check methods are improved
+            Database *db = globalDatabaseInstance();
+            if (!db->open(Database::ReadOnlyDatabase)) {
+                err << i18n("Baloo Index could not be opened") << endl;
+                return 1;
+            }
+            Transaction tr(db, Transaction::ReadOnly);
+            err << i18n("Checking file paths ... ") << endl;
+            tr.checkFsTree();
+
+
+            err << i18n("Checking postings ... ") << endl;
+            tr.checkTermsDbinPostingDb();
+
+            err << i18n("Checking terms ... ") << endl;
+            tr.checkPostingDbinTermsDb();
+        */
+    }
+    err << i18n("Elapsed: %1 secs", timer.nsecsElapsed() / 1000000000.0) << endl;
+
+    return 0;
+}