diff --git a/src/cmdliner_manpage.ml b/src/cmdliner_manpage.ml
index 699564c..3450db3 100644
--- a/src/cmdliner_manpage.ml
+++ b/src/cmdliner_manpage.ml
@@ -446,8 +446,7 @@ let find_cmd cmds =
 
 let pp_to_pager print ppf v =
   let pager =
-    let cmds = ["less"," -R"; "more", ""] in
-    (* Fundamentally env var lookups should try to cut the exec name. *)
+    let cmds = ["less", ""; "more", ""] in
     let cmds = try (Sys.getenv "PAGER", "") :: cmds with Not_found -> cmds in
     let cmds = try (Sys.getenv "MANPAGER", "") :: cmds with Not_found -> cmds in
     find_cmd cmds
@@ -455,7 +454,7 @@ let pp_to_pager print ppf v =
   match pager with
   | None -> print `Plain ppf v
   | Some (pager, opts) ->
-      let pager = pager ^ opts in
+      let pager = "LESS=FRX " ^ pager ^ opts in
       let groffer =
         let cmds =
           ["mandoc", " -m man -K utf-8 -T utf8";