diff --git a/CMakeLists.txt b/CMakeLists.txt
index b125c56e4..0a739efd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ if(NOT ZLIB_SUPPORTS_GZIP)
 endif(NOT ZLIB_SUPPORTS_GZIP)
 
 add_subdirectory(src)
+add_subdirectory(utils)
 if( WITH_TESTS )
     add_subdirectory(tests)
 endif( WITH_TESTS )
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
new file mode 100644
index 000000000..0eafdb14d
--- /dev/null
+++ b/utils/CMakeLists.txt
@@ -0,0 +1,19 @@
+#  Copyright (C) 2010 Felix Geyer <debfx@fobos.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 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_directories(../src)
+
+add_executable( kdbx-extract kdbx-extract.cpp )
+target_link_libraries( kdbx-extract keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} )
diff --git a/utils/kdbx-extract.cpp b/utils/kdbx-extract.cpp
new file mode 100644
index 000000000..a35a571ed
--- /dev/null
+++ b/utils/kdbx-extract.cpp
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (C) 2010 Felix Geyer <debfx@fobos.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 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 <stdio.h>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QStringList>
+#include <QtCore/QTextStream>
+
+#include "crypto/Crypto.h"
+#include "format/KeePass2Reader.h"
+#include "keys/CompositeKey.h"
+#include "keys/PasswordKey.h"
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    if (app.arguments().size() != 3) {
+        qCritical("Usage: kdbx-extract <password> <kdbx file>");
+        return 1;
+    }
+
+    Crypto::init();
+
+    CompositeKey key;
+    PasswordKey password;
+    password.setPassword(app.arguments().at(1));
+    key.addKey(password);
+
+    QFile dbFile(app.arguments().at(2));
+    if (!dbFile.exists()) {
+        qCritical("File does not exist.");
+        return 1;
+    }
+    if (!dbFile.open(QIODevice::ReadOnly)) {
+        qCritical("Unable to open file.");
+        return 1;
+    }
+
+    KeePass2Reader reader;
+    reader.setSaveXml(true);
+    reader.readDatabase(&dbFile, key);
+
+    if (reader.error()) {
+        qCritical("Error while reading the database.");
+        return 1;
+    }
+
+    QTextStream out(stdout);
+    out << reader.xmlData().constData() << "\n";
+
+    return 0;
+}