diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
new file mode 100644
index 000000000..fb659cfab
--- /dev/null
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -0,0 +1,80 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares 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 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares 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 Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "LuksBootKeyFileJob.h"
+
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Variant.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+
+LuksBootKeyFileJob::LuksBootKeyFileJob( QObject* parent )
+    : Calamares::CppJob( parent )
+{
+}
+
+LuksBootKeyFileJob::~LuksBootKeyFileJob() {}
+
+QString
+LuksBootKeyFileJob::prettyName() const
+{
+    return tr( "Configuring LUKS key file." );
+}
+
+struct LuksPassphrase
+{
+    QString device;
+    QString passphrase;
+};
+
+struct GlobalSettings
+{
+    GlobalSettings( const QVariant& partitions )
+        : valid( false )
+    {
+        cDebug() << partitions;
+    }
+
+    QList< LuksPassphrase > filesystems;
+    bool valid;
+};
+
+Calamares::JobResult
+LuksBootKeyFileJob::exec()
+{
+    const auto* gs = Calamares::JobQueue::instance()->globalStorage();
+    if ( !gs )
+    {
+        return Calamares::JobResult::internalError(
+            "LukeBootKeyFile", "No GlobalStorage defined.", Calamares::JobResult::InvalidConfiguration );
+    }
+    if ( !gs->contains( "partitions" ) )
+    {
+        return Calamares::JobResult::internalError(
+            "LukeBootKeyFile",
+            tr( "No partitions are defined for <pre>%1</pre> to use." ).arg( "luksbootkeyfile" ),
+            Calamares::JobResult::InvalidConfiguration );
+    }
+
+    GlobalSettings s( gs->value( "partitions" ) );
+    return Calamares::JobResult::ok();
+}
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( LuksBootKeyFileJobFactory, registerPlugin< LuksBootKeyFileJob >(); )
diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
new file mode 100644
index 000000000..2d4d6d319
--- /dev/null
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
@@ -0,0 +1,48 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares 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 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares 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 Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LUKSBOOTKEYFILEJOB_H
+#define LUKSBOOTKEYFILEJOB_H
+
+#include "CppJob.h"
+#include "PluginDllMacro.h"
+#include "utils/PluginFactory.h"
+
+#include <QObject>
+#include <QVariantMap>
+
+/** @brief Creates the LUKS boot key file and adds it to the cryptsetup.
+ *
+ * This job has no configuration, because it takes everything
+ * from the global storage settings set by others.
+ */
+class PLUGINDLLEXPORT LuksBootKeyFileJob : public Calamares::CppJob
+{
+    Q_OBJECT
+public:
+    explicit LuksBootKeyFileJob( QObject* parent = nullptr );
+    virtual ~LuksBootKeyFileJob() override;
+
+    QString prettyName() const override;
+
+    Calamares::JobResult exec() override;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( LuksBootKeyFileJobFactory )
+
+#endif  // LUKSBOOTKEYFILEJOB_H