diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
index 4f0386e36..0ed5d991d 100644
--- a/src/cli/CMakeLists.txt
+++ b/src/cli/CMakeLists.txt
@@ -14,6 +14,8 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set(cli_SOURCES
+    List.cpp
+    List.h
     Merge.cpp
     Merge.h
     EntropyMeter.cpp
diff --git a/src/cli/List.cpp b/src/cli/List.cpp
new file mode 100644
index 000000000..2049cc1d4
--- /dev/null
+++ b/src/cli/List.cpp
@@ -0,0 +1,101 @@
+/*
+ *  Copyright (C) 2017 KeePassXC Team
+ *
+ *  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 or (at your option)
+ *  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 <cstdlib>
+#include <stdio.h>
+
+#include "List.h"
+
+#include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QFile>
+#include <QStringList>
+#include <QTextStream>
+
+#include "core/Database.h"
+#include "core/Entry.h"
+#include "core/Group.h"
+#include "format/KeePass2Reader.h"
+#include "keys/CompositeKey.h"
+
+void printGroup(Group* group, QString baseName, int depth) {
+
+    QTextStream out(stdout);
+
+    QString groupName = baseName + group->name() + "/";
+    QString indentation = QString("  ").repeated(depth);
+
+    out << indentation << groupName << "\n";
+    out.flush();
+
+    if (group->entries().isEmpty() && group->children().isEmpty()) {
+        out << indentation << "  [empty]\n";
+        return;
+    }
+
+    for (Entry* entry : group->entries()) {
+      out << indentation << "  " << entry->title() << " " << entry->uuid().toHex() << "\n";
+    }
+
+    for (Group* innerGroup : group->children()) {
+        printGroup(innerGroup, groupName, depth + 1);
+    }
+
+}
+
+int List::execute(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QCoreApplication::translate("main",
+                                                                 "List the passwords in the database."));
+    parser.addPositionalArgument("database", QCoreApplication::translate("main", "path of the database."));
+    parser.process(app);
+
+    const QStringList args = parser.positionalArguments();
+    if (args.size() != 1) {
+        parser.showHelp();
+        return EXIT_FAILURE;
+    }
+
+    static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
+    QString line = inputTextStream.readLine();
+    CompositeKey key = CompositeKey::readFromLine(line);
+
+    QString databaseFilename = args.at(0);
+    QFile dbFile(databaseFilename);
+    if (!dbFile.exists()) {
+        qCritical("File %s does not exist.", qPrintable(databaseFilename));
+        return EXIT_FAILURE;
+    }
+    if (!dbFile.open(QIODevice::ReadOnly)) {
+        qCritical("Unable to open file %s.", qPrintable(databaseFilename));
+        return EXIT_FAILURE;
+    }
+
+    KeePass2Reader reader;
+    Database* db = reader.readDatabase(&dbFile, key);
+
+    if (reader.hasError()) {
+        qCritical("Error while parsing the database:\n%s\n", qPrintable(reader.errorString()));
+        return EXIT_FAILURE;
+    }
+
+    printGroup(db->rootGroup(), QString(""), 0);
+    return EXIT_SUCCESS;
+}
diff --git a/src/cli/List.h b/src/cli/List.h
new file mode 100644
index 000000000..76f086c63
--- /dev/null
+++ b/src/cli/List.h
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2017 KeePassXC Team
+ *
+ *  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 or (at your option)
+ *  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/>.
+ */
+
+#ifndef KEEPASSXC_LIST_H
+#define KEEPASSXC_LIST_H
+
+class List
+{
+public:
+    static int execute(int argc, char** argv);
+};
+
+#endif // KEEPASSXC_LIST_H
diff --git a/src/cli/keepassxc-cli.cpp b/src/cli/keepassxc-cli.cpp
index a7e7c275c..67eb8e8ad 100644
--- a/src/cli/keepassxc-cli.cpp
+++ b/src/cli/keepassxc-cli.cpp
@@ -21,6 +21,7 @@
 #include <QCoreApplication>
 #include <QStringList>
 
+#include <cli/List.h>
 #include <cli/Merge.h>
 #include <cli/Extract.h>
 #include <cli/EntropyMeter.h>
@@ -64,6 +65,11 @@ int main(int argc, char **argv)
     ++argv;
     --argc;
 
+    if (commandName == "list") {
+      argv[0] = const_cast<char*>("keepassxc-cli list");
+      return List::execute(argc, argv);
+    }
+
     if (commandName == "merge") {
       argv[0] = const_cast<char*>("keepassxc-cli merge");
       return Merge::execute(argc, argv);