diff --git a/degesch.c b/degesch.c
index e829fb0..ccd5d00 100644
--- a/degesch.c
+++ b/degesch.c
@@ -2683,6 +2683,16 @@ buffer_rename (struct app_context *ctx,
 	}
 }
 
+static void
+buffer_clear (struct buffer *buffer)
+{
+	LIST_FOR_EACH (struct buffer_line, iter, buffer->lines)
+		buffer_line_destroy (iter);
+
+	buffer->lines = buffer->lines_tail = NULL;
+	buffer->lines_count = 0;
+}
+
 static struct buffer *
 buffer_at_index (struct app_context *ctx, int n)
 {
@@ -5930,7 +5940,9 @@ handle_command_buffer (struct app_context *ctx, struct handler_args *a)
 		show_buffers_list (ctx);
 	else if (!strcasecmp_ascii (action, "clear"))
 	{
-		// TODO
+		buffer_clear (a->buffer);
+		// XXX: clear screen?
+		buffer_print_backlog (ctx, a->buffer);
 	}
 	else if (!strcasecmp_ascii (action, "move"))
 	{