diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 87aef47b..be961812 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -224,6 +224,8 @@ static void ipc_json_describe_output(struct sway_output *output,
 				* ((double)output->height / parent_box.height);
 		json_object_object_add(object, "percent", json_object_new_double(percent));
 	}
+
+	json_object_object_add(object, "max_render_time", json_object_new_int(output->max_render_time));
 }
 
 json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
diff --git a/swaymsg/main.c b/swaymsg/main.c
index a018a68e..596cf4ef 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -189,13 +189,14 @@ static void pretty_print_output(json_object *o) {
 	json_object_object_get_ex(o, "focused", &focused);
 	json_object_object_get_ex(o, "active", &active);
 	json_object_object_get_ex(o, "current_workspace", &ws);
-	json_object *make, *model, *serial, *scale, *subpixel, *transform;
+	json_object *make, *model, *serial, *scale, *subpixel, *transform, *max_render_time;
 	json_object_object_get_ex(o, "make", &make);
 	json_object_object_get_ex(o, "model", &model);
 	json_object_object_get_ex(o, "serial", &serial);
 	json_object_object_get_ex(o, "scale", &scale);
 	json_object_object_get_ex(o, "subpixel_hinting", &subpixel);
 	json_object_object_get_ex(o, "transform", &transform);
+	json_object_object_get_ex(o, "max_render_time", &max_render_time);
 	json_object *x, *y;
 	json_object_object_get_ex(rect, "x", &x);
 	json_object_object_get_ex(rect, "y", &y);
@@ -215,7 +216,8 @@ static void pretty_print_output(json_object *o) {
 			"  Scale factor: %f\n"
 			"  Subpixel hinting: %s\n"
 			"  Transform: %s\n"
-			"  Workspace: %s\n",
+			"  Workspace: %s\n"
+			"  Max render time: ",
 			json_object_get_string(name),
 			json_object_get_string(make),
 			json_object_get_string(model),
@@ -230,6 +232,8 @@ static void pretty_print_output(json_object *o) {
 			json_object_get_string(transform),
 			json_object_get_string(ws)
 		);
+		int max_render_time_int = json_object_get_int(max_render_time);
+		printf(max_render_time_int == 0 ? "off\n" : "%d ms\n", max_render_time_int);
 	} else {
 		printf(
 			"Output %s '%s %s %s' (inactive)\n",