diff --git a/src/output.c b/src/output.c
index 1bf01429..38de88de 100644
--- a/src/output.c
+++ b/src/output.c
@@ -431,7 +431,7 @@ output_init(struct server *server)
 	 * Create an output layout, which is a wlroots utility for working with
 	 * an arrangement of screens in a physical layout.
 	 */
-	server->output_layout = wlr_output_layout_create();
+	server->output_layout = wlr_output_layout_create(server->wl_display);
 	if (!server->output_layout) {
 		wlr_log(WLR_ERROR, "unable to create output layout");
 		exit(EXIT_FAILURE);
diff --git a/src/server.c b/src/server.c
index 8b1a4fd4..dcdf8c44 100644
--- a/src/server.c
+++ b/src/server.c
@@ -542,8 +542,6 @@ server_finish(struct server *server)
 	wl_display_destroy_clients(server->wl_display);
 
 	seat_finish(server);
-	wlr_output_layout_destroy(server->output_layout);
-
 	wl_display_destroy(server->wl_display);
 
 	/* TODO: clean up various scene_tree nodes */
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index bde76b47..549c6ca7 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = f1762f428b0ef2989c81f57ea9e810403d34d946
+revision = d61ec694b352c0f21c06958c5ef0417f3e424e3c
 
 [provide]
 dependency_names = wlroots