diff --git a/degesch.c b/degesch.c
index 1b2e817..989c239 100644
--- a/degesch.c
+++ b/degesch.c
@@ -802,6 +802,9 @@ buffer_remove (struct app_context *ctx, struct buffer *buffer)
 {
 	hard_assert (buffer != ctx->current_buffer);
 
+	// rl_clear_history, being the only way I know of to get rid of the complete
+	// history including attached data, is a pretty recent addition.  *sigh*
+#if RL_READLINE_VERSION >= 0x0603
 	if (buffer->history)
 	{
 		// See buffer_activate() for why we need to do this BS
@@ -816,6 +819,7 @@ buffer_remove (struct app_context *ctx, struct buffer *buffer)
 		history_set_history_state (state);
 		free (state);
 	}
+#endif // RL_READLINE_VERSION
 
 	str_map_set (&ctx->buffers_by_name, buffer->name, NULL);
 	LIST_UNLINK_WITH_TAIL (ctx->buffers, ctx->buffers_tail, buffer);