diff --git a/include/wlr/types/wlr_export_dmabuf_v1.h b/include/wlr/types/wlr_export_dmabuf_v1.h
index 2c5a24525..5e5c21cd2 100644
--- a/include/wlr/types/wlr_export_dmabuf_v1.h
+++ b/include/wlr/types/wlr_export_dmabuf_v1.h
@@ -32,6 +32,7 @@ struct wlr_export_dmabuf_frame_v1 {
 	struct wl_list link; // wlr_export_dmabuf_manager_v1.frames
 
 	struct wlr_output *output;
+	struct wlr_buffer *buffer;
 
 	bool cursor_locked;
 
diff --git a/protocol/wlr-export-dmabuf-unstable-v1.xml b/protocol/wlr-export-dmabuf-unstable-v1.xml
index 751f7efbf..cdae52432 100644
--- a/protocol/wlr-export-dmabuf-unstable-v1.xml
+++ b/protocol/wlr-export-dmabuf-unstable-v1.xml
@@ -36,14 +36,14 @@
     interface version number is reset.
   </description>
 
-  <interface name="zwlr_export_dmabuf_manager_v1" version="1">
+  <interface name="zwlr_export_dmabuf_manager_v1" version="2">
     <description summary="manager to inform clients and begin capturing">
       This object is a manager with which to start capturing from sources.
     </description>
 
     <request name="capture_output">
       <description summary="capture a frame from an output">
-        Capture the next frame of a an entire output.
+        Capture the next frame of an entire output.
       </description>
       <arg name="frame" type="new_id" interface="zwlr_export_dmabuf_frame_v1"/>
       <arg name="overlay_cursor" type="int"
@@ -59,7 +59,7 @@
     </request>
   </interface>
 
-  <interface name="zwlr_export_dmabuf_frame_v1" version="1">
+  <interface name="zwlr_export_dmabuf_frame_v1" version="2">
     <description summary="a DMA-BUF frame">
       This object represents a single DMA-BUF frame.
 
@@ -136,7 +136,7 @@
       <arg name="stride" type="uint"
            summary="line size in bytes"/>
       <arg name="plane_index" type="uint"
-           summary="index of the the plane the data in the object applies to"/>
+           summary="index of the plane the data in the object applies to"/>
     </event>
 
     <event name="ready">
@@ -195,6 +195,10 @@
         Unreferences the frame. This request must be called as soon as its no
         longer used.
 
+        Starting from version 2, this indicates that the client has finished
+        processing the frame. The client must not access the underlying buffer
+        after destroying the zwlr_export_dmabuf_frame_v1 object.
+
         It can be called at any time by the client. The client will still have
         to close any FDs it has been given.
       </description>
diff --git a/types/wlr_export_dmabuf_v1.c b/types/wlr_export_dmabuf_v1.c
index 4e629dcfd..04ea5b8d6 100644
--- a/types/wlr_export_dmabuf_v1.c
+++ b/types/wlr_export_dmabuf_v1.c
@@ -7,7 +7,7 @@
 #include <wlr/util/log.h>
 #include "wlr-export-dmabuf-unstable-v1-protocol.h"
 
-#define EXPORT_DMABUF_MANAGER_VERSION 1
+#define EXPORT_DMABUF_MANAGER_VERSION 2
 
 
 static const struct zwlr_export_dmabuf_frame_v1_interface frame_impl;
@@ -32,6 +32,7 @@ static void frame_destroy(struct wlr_export_dmabuf_frame_v1 *frame) {
 	if (frame == NULL) {
 		return;
 	}
+	wlr_buffer_unlock(frame->buffer);
 	if (frame->output != NULL) {
 		wlr_output_lock_attach_render(frame->output, false);
 		if (frame->cursor_locked) {
@@ -90,7 +91,13 @@ static void frame_output_handle_commit(struct wl_listener *listener,
 	uint32_t tv_sec_lo = tv_sec & 0xFFFFFFFF;
 	zwlr_export_dmabuf_frame_v1_send_ready(frame->resource,
 		tv_sec_hi, tv_sec_lo, event->when.tv_nsec);
-	frame_destroy(frame);
+
+	uint32_t version = wl_resource_get_version(frame->resource);
+	if (version < 2) {
+		frame_destroy(frame);
+	} else {
+		frame->buffer = wlr_buffer_lock(event->state->buffer);
+	}
 }
 
 static void frame_output_handle_destroy(struct wl_listener *listener, void *data) {