diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0f65b6d6..1566c1df8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### New features
 
 * Commands with long output are paginated.
+  [#9](https://github.com/martinvonz/jj/issues/9)
 
 * The new `jj git remote rename` command allows git remotes to be renamed
   in-place.
diff --git a/docs/config.md b/docs/config.md
index 030acf9e0..273188998 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -59,7 +59,7 @@ The priority is as follows (environment variables are marked with a `$`):
 
 `ui.pager` > `$PAGER`
 
-`less` is the default pager in the absence of any other setting.
+`less -FRX` is the default pager in the absence of any other setting.
 
 
 ## Editor
diff --git a/src/ui.rs b/src/ui.rs
index d26749099..dc4899172 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -111,7 +111,7 @@ fn pager_setting(settings: &UserSettings) -> FullCommandArgs {
     settings
         .config()
         .get("ui.pager")
-        .unwrap_or_else(|_| "less".into())
+        .unwrap_or_else(|_| "less -FRX".into())
 }
 
 impl Ui {