diff --git a/log_create_main.cpp b/log_create_main.cpp
new file mode 100644
index 0000000..4347152
--- /dev/null
+++ b/log_create_main.cpp
@@ -0,0 +1,71 @@
+#include <CLI/CLI.hpp>
+#include <nlohmann/json.hpp>
+#include <phosphor-logging/commit.hpp>
+#include <sdbusplus/exception.hpp>
+
+// We don't actually use the Logging events, but we need to include the
+// header in order to force linking against the PDI library.
+#include <xyz/openbmc_project/Logging/event.hpp>
+
+#include <iostream>
+#include <string>
+
+void list_all()
+{
+    std::cout << "Known events:" << std::endl;
+    for (const auto& e : sdbusplus::exception::known_events())
+    {
+        std::cout << "    " << e << std::endl;
+    }
+}
+
+int generate_event(const std::string& eventId, const nlohmann::json& data)
+{
+    if (eventId.empty())
+    {
+        std::cerr << "event required" << std::endl;
+        return 1;
+    }
+
+    nlohmann::json j = {{eventId, data}};
+
+    try
+    {
+        sdbusplus::exception::throw_via_json(j);
+    }
+    catch (sdbusplus::exception::generated_event_base& e)
+    {
+        auto path = lg2::details::commit(std::move(e));
+        std::cout << path.str << std::endl;
+        return 0;
+    }
+
+    std::cerr << "Unknown event: " << eventId << std::endl;
+    return 1;
+}
+
+int main(int argc, char** argv)
+{
+    CLI::App app{"log-create"};
+
+    std::string jsonStr;
+    app.add_option("-j,--json", jsonStr, "Event data as a JSON object")
+        ->default_val("{}");
+
+    std::string event{};
+    auto event_option = app.add_option("event", event, "Event name");
+
+    bool listOnly;
+    app.add_flag("-l,--list", listOnly, "List all events")
+        ->excludes(event_option);
+
+    CLI11_PARSE(app, argc, argv);
+
+    if (listOnly)
+    {
+        list_all();
+        return 0;
+    }
+
+    return generate_event(event, nlohmann::json::parse(jsonStr));
+}