diff --git a/src/lib.rs b/src/lib.rs
index 71bfdbd1f..cea4bb17b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,3 +40,4 @@ pub mod session_lock;
 pub mod shell;
 pub mod shm;
 pub mod subcompositor;
+pub mod workspace_manager;
diff --git a/src/workspace_manager.rs b/src/workspace_manager.rs
new file mode 100644
index 000000000..3fa02f558
--- /dev/null
+++ b/src/workspace_manager.rs
@@ -0,0 +1,324 @@
+use crate::{dispatch2::Dispatch2, globals::GlobalData, registry::GlobalProxy};
+use std::sync::{Arc, Mutex};
+use wayland_client::{
+    globals::GlobalList, protocol::wl_output, Connection, Dispatch, Proxy, QueueHandle, WEnum,
+};
+use wayland_protocols::ext::workspace::v1::client::{
+    ext_workspace_group_handle_v1::{self, GroupCapabilities},
+    ext_workspace_handle_v1::{self, State, WorkspaceCapabilities},
+    ext_workspace_manager_v1,
+};
+
+/// Information about a workspace.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[non_exhaustive]
+pub struct WorkspaceInfo {
+    // ID
+    pub id: String,
+    // Name
+    pub name: String,
+    // State
+    pub state: Option<WEnum<State>>,
+    // Coordinates
+    pub coordinates: Vec<u8>,
+    // Capabilities
+    pub capabilities: Option<WEnum<WorkspaceCapabilities>>,
+}
+
+/// Information about a workspace group.
+#[derive(Clone, Debug, Default)]
+#[non_exhaustive]
+pub struct GroupInfo {
+    // Outputs
+    pub outputs: Vec<wl_output::WlOutput>,
+    // Workspaces
+    pub workspaces: Vec<ext_workspace_handle_v1::ExtWorkspaceHandleV1>,
+    // Capabilities
+    pub capabilities: Option<WEnum<GroupCapabilities>>,
+}
+
+#[derive(Debug, Default)]
+struct WorkspaceInner {
+    current_info: Option<WorkspaceInfo>,
+    pending_info: WorkspaceInfo,
+}
+
+#[derive(Debug, Default)]
+struct GroupInner {
+    current_info: Option<GroupInfo>,
+    pending_info: GroupInfo,
+}
+
+#[doc(hidden)]
+#[derive(Debug, Default, Clone)]
+pub struct WorkspaceData(Arc<Mutex<WorkspaceInner>>);
+
+#[doc(hidden)]
+#[derive(Debug, Default, Clone)]
+pub struct GroupData(Arc<Mutex<GroupInner>>);
+
+#[derive(Debug)]
+pub struct WorkspaceManager {
+    workspace_manager: GlobalProxy<ext_workspace_manager_v1::ExtWorkspaceManagerV1>,
+    workspaces: Vec<ext_workspace_handle_v1::ExtWorkspaceHandleV1>,
+    groups: Vec<ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1>,
+}
+
+impl WorkspaceManager {
+    pub fn new<D>(globals: &GlobalList, qh: &QueueHandle<D>) -> Self
+    where
+        D: Dispatch<ext_workspace_manager_v1::ExtWorkspaceManagerV1, GlobalData> + 'static,
+    {
+        let workspace_manager = GlobalProxy::from(globals.bind(qh, 1..=1, GlobalData));
+        Self { workspace_manager, workspaces: Vec::new(), groups: Vec::new() }
+    }
+
+    /// Returns list of workspaces.
+    pub fn workspaces(&self) -> &[ext_workspace_handle_v1::ExtWorkspaceHandleV1] {
+        &self.workspaces
+    }
+
+    /// Returns list of workspace groups.
+    pub fn groups(&self) -> &[ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1] {
+        &self.groups
+    }
+
+    /// Returns information about a workspace.
+    ///
+    /// This may be none if the workspace has been destroyed or the compositor has not sent
+    /// information about the workspace yet.
+    pub fn info(
+        &self,
+        workspace: &ext_workspace_handle_v1::ExtWorkspaceHandleV1,
+    ) -> Option<WorkspaceInfo> {
+        workspace.data::<WorkspaceData>()?.0.lock().unwrap().current_info.clone()
+    }
+
+    /// Returns information about a workspace group.
+    pub fn info_group(
+        &self,
+        group: &ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1,
+    ) -> Option<GroupInfo> {
+        group.data::<GroupData>()?.0.lock().unwrap().current_info.clone()
+    }
+
+    pub fn stop(&self) {
+        if let Ok(workspace_manager) = self.workspace_manager.get() {
+            workspace_manager.stop();
+        }
+    }
+}
+
+/// Handler trait for ext workspaces protocol.
+pub trait WorkspaceHandler: Sized {
+    fn ext_workspace_state(&mut self) -> &mut WorkspaceManager;
+
+    /// A new workspace has been created.
+    fn new_workspace(
+        &mut self,
+        conn: &Connection,
+        qh: &QueueHandle<Self>,
+        workspace_handle: ext_workspace_handle_v1::ExtWorkspaceHandleV1,
+    );
+
+    /// An existing workspace has changed.
+    fn update_workspace(
+        &mut self,
+        conn: &Connection,
+        qh: &QueueHandle<Self>,
+        workspace_handle: ext_workspace_handle_v1::ExtWorkspaceHandleV1,
+    );
+
+    /// A workspace has been removed.
+    fn workspace_removed(
+        &mut self,
+        conn: &Connection,
+        qh: &QueueHandle<Self>,
+        workspace_handle: ext_workspace_handle_v1::ExtWorkspaceHandleV1,
+    );
+
+    /// A new workspace group has been created.
+    fn new_group(
+        &mut self,
+        conn: &Connection,
+        qh: &QueueHandle<Self>,
+        group_handle: ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1,
+    );
+
+    /// A workspace group has been updated.
+    fn update_group(
+        &mut self,
+        conn: &Connection,
+        qh: &QueueHandle<Self>,
+        group_handle: ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1,
+    );
+
+    /// A workspace group has been removed.
+    fn group_removed(
+        &mut self,
+        conn: &Connection,
+        qh: &QueueHandle<Self>,
+        group_handle: ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1,
+    );
+
+    /// All workspaces/groups have been updated.
+    fn done(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>) {}
+
+    fn finished(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>) {}
+}
+
+impl<D> Dispatch2<ext_workspace_manager_v1::ExtWorkspaceManagerV1, D> for GlobalData
+where
+    D: Dispatch<ext_workspace_handle_v1::ExtWorkspaceHandleV1, WorkspaceData>
+        + Dispatch<ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1, GroupData>
+        + WorkspaceHandler
+        + 'static,
+{
+    fn event(
+        &self,
+        state: &mut D,
+        proxy: &ext_workspace_manager_v1::ExtWorkspaceManagerV1,
+        event: ext_workspace_manager_v1::Event,
+        conn: &Connection,
+        qh: &QueueHandle<D>,
+    ) {
+        match event {
+            ext_workspace_manager_v1::Event::WorkspaceGroup { workspace_group } => {
+                state.ext_workspace_state().groups.push(workspace_group);
+            }
+            ext_workspace_manager_v1::Event::Workspace { workspace } => {
+                state.ext_workspace_state().workspaces.push(workspace);
+            }
+            ext_workspace_manager_v1::Event::Done => {
+                // TODO: is cloning really the best for performance?
+                // Workspaces
+                for ref workspace in state.ext_workspace_state().workspaces.clone() {
+                    let handle = workspace.data::<WorkspaceData>().unwrap();
+                    let mut inner = handle.0.lock().unwrap();
+                    let just_created = inner.current_info.is_none();
+                    inner.current_info = Some(inner.pending_info.clone());
+                    drop(inner);
+                    if just_created {
+                        state.new_workspace(conn, qh, workspace.clone());
+                    } else {
+                        state.update_workspace(conn, qh, workspace.clone());
+                    }
+                }
+                // Groups
+                for ref group in state.ext_workspace_state().groups.clone() {
+                    let handle = group.data::<GroupData>().unwrap();
+                    let mut inner = handle.0.lock().unwrap();
+                    let just_created = inner.current_info.is_none();
+                    inner.current_info = Some(inner.pending_info.clone());
+                    drop(inner);
+                    if just_created {
+                        state.new_group(conn, qh, group.clone());
+                    } else {
+                        state.update_group(conn, qh, group.clone());
+                    }
+                }
+                state.done(conn, qh);
+            }
+            ext_workspace_manager_v1::Event::Finished => {
+                state.finished(conn, qh);
+                proxy.stop();
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    wayland_client::event_created_child!(D, ext_workspace_manager_v1::ExtWorkspaceManagerV1, [
+        ext_workspace_manager_v1::EVT_WORKSPACE_GROUP_OPCODE => (ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1, Default::default()),
+        ext_workspace_manager_v1::EVT_WORKSPACE_OPCODE => (ext_workspace_handle_v1::ExtWorkspaceHandleV1, Default::default()),
+    ]);
+}
+
+// Workspace event handler
+impl<D> Dispatch2<ext_workspace_handle_v1::ExtWorkspaceHandleV1, D> for WorkspaceData
+where
+    D: WorkspaceHandler,
+{
+    fn event(
+        &self,
+        state: &mut D,
+        handle: &ext_workspace_handle_v1::ExtWorkspaceHandleV1,
+        event: ext_workspace_handle_v1::Event,
+        conn: &Connection,
+        qh: &QueueHandle<D>,
+    ) {
+        match event {
+            ext_workspace_handle_v1::Event::Removed => {
+                state.workspace_removed(conn, qh, handle.clone());
+                let workspaces = &mut state.ext_workspace_state().workspaces;
+                if let Some(idx) = workspaces.iter().position(|x| x == handle) {
+                    workspaces.remove(idx);
+                }
+                handle.destroy();
+            }
+            ext_workspace_handle_v1::Event::Id { id } => {
+                self.0.lock().unwrap().pending_info.id = id;
+            }
+            ext_workspace_handle_v1::Event::Name { name } => {
+                self.0.lock().unwrap().pending_info.name = name;
+            }
+            ext_workspace_handle_v1::Event::Coordinates { coordinates } => {
+                self.0.lock().unwrap().pending_info.coordinates = coordinates;
+            }
+            ext_workspace_handle_v1::Event::State { state } => {
+                self.0.lock().unwrap().pending_info.state = Some(state);
+            }
+            ext_workspace_handle_v1::Event::Capabilities { capabilities } => {
+                self.0.lock().unwrap().pending_info.capabilities = Some(capabilities);
+            }
+            _ => unreachable!(),
+        }
+    }
+}
+
+// Workspace group event handler
+impl<D> Dispatch2<ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1, D> for GroupData
+where
+    D: WorkspaceHandler,
+{
+    fn event(
+        &self,
+        state: &mut D,
+        handle: &ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1,
+        event: ext_workspace_group_handle_v1::Event,
+        conn: &Connection,
+        qh: &QueueHandle<D>,
+    ) {
+        match event {
+            ext_workspace_group_handle_v1::Event::Removed => {
+                state.group_removed(conn, qh, handle.clone());
+                let groups = &mut state.ext_workspace_state().groups;
+                if let Some(idx) = groups.iter().position(|x| x == handle) {
+                    groups.remove(idx);
+                }
+                handle.destroy();
+            }
+            ext_workspace_group_handle_v1::Event::OutputEnter { output } => {
+                self.0.lock().unwrap().pending_info.outputs.push(output);
+            }
+            ext_workspace_group_handle_v1::Event::OutputLeave { ref output } => {
+                let outputs = &mut self.0.lock().unwrap().pending_info.outputs;
+                if let Some(idx) = outputs.iter().position(|x| x == output) {
+                    outputs.remove(idx);
+                }
+            }
+            ext_workspace_group_handle_v1::Event::WorkspaceEnter { workspace } => {
+                self.0.lock().unwrap().pending_info.workspaces.push(workspace)
+            }
+            ext_workspace_group_handle_v1::Event::WorkspaceLeave { ref workspace } => {
+                let workspaces = &mut self.0.lock().unwrap().pending_info.workspaces;
+                if let Some(idx) = workspaces.iter().position(|x| x == workspace) {
+                    workspaces.remove(idx);
+                }
+            }
+            ext_workspace_group_handle_v1::Event::Capabilities { capabilities } => {
+                self.0.lock().unwrap().pending_info.capabilities = Some(capabilities);
+            }
+            _ => unreachable!(),
+        }
+    }
+}