diff --git a/config.c b/config.c
index d2b75180..bf0e763a 100644
--- a/config.c
+++ b/config.c
@@ -1092,6 +1092,9 @@ parse_section_scrollback(struct context *ctx)
     if (streq(key, "lines"))
         return value_to_uint32(ctx, 10, &conf->scrollback.lines);
 
+    else if (streq(key, "unlimited"))
+        return value_to_bool(ctx, &conf->scrollback.unlimited);
+
     else if (streq(key, "indicator-position")) {
         _Static_assert(
             sizeof(conf->scrollback.indicator.position) == sizeof(int),
diff --git a/config.h b/config.h
index 30219ff0..7edb46e8 100644
--- a/config.h
+++ b/config.h
@@ -175,6 +175,7 @@ struct config {
 
     struct {
         uint32_t lines;
+        bool unlimited;
 
         struct {
             enum {