diff --git a/plugins/single_plugins/meson.build b/plugins/single_plugins/meson.build
index 614cecdc0..24a638816 100644
--- a/plugins/single_plugins/meson.build
+++ b/plugins/single_plugins/meson.build
@@ -2,6 +2,7 @@ plugins = [
   'move', 'resize', 'command', 'autostart', 'vswipe', 'grid', 'wrot', 'expo',
   'switcher', 'fast-switcher', 'oswitch', 'place', 'invert',
   'fisheye', 'zoom', 'alpha', 'idle', 'extra-gestures', 'preserve-output',
+  'wlr-workspaces',
 ]
 
 all_include_dirs = [wayfire_api_inc, wayfire_conf_inc, plugins_common_inc, vswitch_inc, wobbly_inc]
diff --git a/plugins/single_plugins/wlr-workspaces.cpp b/plugins/single_plugins/wlr-workspaces.cpp
new file mode 100644
index 000000000..1b529f9e1
--- /dev/null
+++ b/plugins/single_plugins/wlr-workspaces.cpp
@@ -0,0 +1,148 @@
+#include <wayfire/plugin.hpp>
+#include <wayfire/core.hpp>
+#include <wayfire/output.hpp>
+#include <wayfire/workspace-manager.hpp>
+#include <wayfire/signal-definitions.hpp>
+
+extern "C"
+{
+#include <wlr/types/wlr_ext_workspace_v1.h>
+}
+
+namespace wf
+{
+/**
+ * The workspaces manager is stored in core, to allow for a single instance.
+ */
+class wlr_ext_workspaces_manager : public custom_data_t
+{
+  public:
+    int refcount = 0;
+    wlr_ext_workspace_manager_v1 *manager;
+    wlr_ext_workspaces_manager()
+    {
+        manager = wlr_ext_workspace_manager_v1_create(wf::get_core().display);
+    }
+};
+
+class wlr_ext_workspaces_intergration : public plugin_interface_t
+{
+  public:
+    wlr_ext_workspace_group_handle_v1 *group;
+    std::vector<std::vector<wlr_ext_workspace_handle_v1*>> workspaces;
+    std::vector<std::vector<std::unique_ptr<wl_listener_wrapper>>> on_ws_remove;
+
+    wf::wl_listener_wrapper on_commit;
+    wf::wl_listener_wrapper on_ws_create;
+
+    void init() override
+    {
+        /* Take ref to manager */
+        auto manager = wf::get_core().get_data_safe<wlr_ext_workspaces_manager>();
+        ++manager->refcount;
+
+        /* Create group & workspaces */
+        group = wlr_ext_workspace_group_handle_v1_create(manager->manager);
+        on_ws_create.set_callback([&] (void *data)
+        {
+            auto ev = static_cast<
+                wlr_ext_workspace_group_handle_v1_create_workspace_event*>(data);
+            LOGD("Application requested creation of workspace ", ev->name);
+        });
+        on_ws_create.connect(&group->events.create_workspace_request);
+
+        dimensions_t ws_dim = output->workspace->get_workspace_grid_size();
+        workspaces.resize(ws_dim.height,
+            std::vector<wlr_ext_workspace_handle_v1*>(ws_dim.width));
+        on_ws_remove.resize(ws_dim.height);
+        for (int i = 0; i < ws_dim.height; i++)
+        {
+            for (int j = 0; j < ws_dim.width; j++)
+            {
+                workspaces[i][j] = wlr_ext_workspace_handle_v1_create(group);
+
+                std::string name =
+                    output->to_string() + ":workspace-" +
+                    std::to_string(i * ws_dim.width + j);
+                wlr_ext_workspace_handle_v1_set_name(workspaces[i][j], name.c_str());
+
+                wl_array coordinates;
+                wl_array_init(&coordinates);
+                *(int32_t*)wl_array_add(&coordinates, sizeof(int32_t)) = i;
+                *(int32_t*)wl_array_add(&coordinates, sizeof(int32_t)) = j;
+                wlr_ext_workspace_handle_v1_set_coordinates(
+                    workspaces[i][j], &coordinates);
+                wl_array_release(&coordinates);
+
+                on_ws_remove[i].emplace_back(
+                    std::make_unique<wf::wl_listener_wrapper>());
+                on_ws_remove[i][j] = std::make_unique<wf::wl_listener_wrapper>();
+                on_ws_remove[i][j]->set_callback([=] (void*)
+                {
+                    LOGD("Application requested removal of workspace (",
+                        i, ", ", j, ")");
+                });
+
+                on_ws_remove[i][j]->connect(&workspaces[i][j]->events.remove_request);
+            }
+        }
+
+        /* Initially, workspace 0,0 is active */
+        wlr_ext_workspace_handle_v1_set_active(workspaces[0][0], true);
+        output->connect_signal("workspace-changed", &on_current_workspace_changed);
+
+        /* Listen for client requests */
+        on_commit.set_callback([&] (void*)
+        {
+            point_t active_workspace = {0, 0};
+            dimensions_t ws_dim = output->workspace->get_workspace_grid_size();
+
+            for (int i = 0; i < ws_dim.height; i++)
+            {
+                for (int j = 0; j < ws_dim.width; j++)
+                {
+                    if (workspaces[i][j]->current &
+                        WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE)
+                    {
+                        // workspaces in core are [column, row]
+                        active_workspace = {j, i};
+                    }
+                }
+            }
+
+            output->workspace->request_workspace(active_workspace);
+        });
+        on_commit.connect(&manager->manager->events.commit);
+    }
+
+    signal_connection_t on_current_workspace_changed = [&] (signal_data_t *data)
+    {
+        auto ev = static_cast<wf::workspace_changed_signal*>(data);
+        wlr_ext_workspace_handle_v1_set_active(
+            workspaces[ev->old_viewport.y][ev->old_viewport.x], false);
+        wlr_ext_workspace_handle_v1_set_active(
+            workspaces[ev->new_viewport.y][ev->new_viewport.x], true);
+    };
+
+    void fini() override
+    {
+        auto manager = wf::get_core().get_data<wlr_ext_workspaces_manager>();
+        --manager->refcount;
+
+        if (manager->refcount <= 0)
+        {
+            /** Make sure to clean up global data on shutdown */
+            wf::get_core().erase_data<wlr_ext_workspaces_manager>();
+        }
+    }
+
+    /** Currently, we do not want to kill clients when unloading this plugin, so
+     * we disallow disabling it. */
+    bool is_unloadable() override
+    {
+        return false;
+    }
+};
+}
+
+DECLARE_WAYFIRE_PLUGIN(wf::wlr_ext_workspaces_intergration);
diff --git a/src/output/plugin-loader.cpp b/src/output/plugin-loader.cpp
index 3202b1183..2a550ebeb 100644
--- a/src/output/plugin-loader.cpp
+++ b/src/output/plugin-loader.cpp
@@ -181,15 +181,23 @@ void plugin_manager::reload_dynamic_plugins()
                 continue;
             }
 
+            bool found = false;
             for (std::filesystem::path plugin_prefix : plugin_prefixes)
             {
                 auto plugin_path = plugin_prefix / ("lib" + plugin_name + ".so");
                 if (std::filesystem::exists(plugin_path))
                 {
+                    found = true;
                     next_plugins.push_back(plugin_path);
                     break;
                 }
             }
+
+            if (!found)
+            {
+                LOGE("Could not find plugin \"", plugin_name, "\"",
+                    " in WAYFIRE_PLUGIN_PATH or in \"", PLUGIN_PATH, "\"");
+            }
         }
     }