diff --git a/sway/commands/create_output.c b/sway/commands/create_output.c
index 79283fd11..edb482f8b 100644
--- a/sway/commands/create_output.c
+++ b/sway/commands/create_output.c
@@ -1,3 +1,4 @@
+#include <strings.h>
 #include <wlr/config.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
@@ -9,23 +10,28 @@
 #include "sway/server.h"
 #include "log.h"
 
+struct create_result {
+	bool done;
+	struct wlr_output *new_output;
+};
+
 static void create_output(struct wlr_backend *backend, void *data) {
-	bool *done = data;
-	if (*done) {
+	struct create_result *result = data;
+	if (result->done) {
 		return;
 	}
 
 	if (wlr_backend_is_wl(backend)) {
-		wlr_wl_output_create(backend);
-		*done = true;
+		result->new_output = wlr_wl_output_create(backend);
+		result->done = true;
 	} else if (wlr_backend_is_headless(backend)) {
-		wlr_headless_add_output(backend, 1920, 1080);
-		*done = true;
+		result->new_output = wlr_headless_add_output(backend, 1920, 1080);
+		result->done = true;
 	}
 #if WLR_HAS_X11_BACKEND
 	else if (wlr_backend_is_x11(backend)) {
-		wlr_x11_output_create(backend);
-		*done = true;
+		result->new_output = wlr_x11_output_create(backend);
+		result->done = true;
 	}
 #endif
 }
@@ -37,13 +43,25 @@ struct cmd_results *cmd_create_output(int argc, char **argv) {
 	sway_assert(wlr_backend_is_multi(server.backend),
 			"Expected a multi backend");
 
-	bool done = false;
-	wlr_multi_for_each_backend(server.backend, create_output, &done);
+	struct create_result result = { false, NULL };
+	wlr_multi_for_each_backend(server.backend, create_output, &result);
 
-	if (!done) {
+	if (!result.done) {
 		return cmd_results_new(CMD_INVALID,
 			"Can only create outputs for Wayland, X11 or headless backends");
 	}
 
+	bool should_set_name = argc >= 2 && strcasecmp(argv[0], "name") == 0;
+
+	if (should_set_name) {
+		if (NULL == result.new_output) {
+			return cmd_results_new(CMD_FAILURE,
+				"Cannot assign name to new output");
+		}
+
+		sway_log(SWAY_DEBUG, "Set new output name to %s", argv[1]);
+		wlr_output_set_name(result.new_output, argv[1]);
+	}
+
 	return cmd_results_new(CMD_SUCCESS, NULL);
 }