diff --git a/master_changes.md b/master_changes.md
index c068a731a99..1b0e649fd90 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -44,6 +44,9 @@ users)
 
 ## Exec
 
+## Env
+  * Fix `opam env` containing carriage return on Cygwin [#5715 @rjbou - fix #5684]
+
 ## Source
 
 ## Lint
diff --git a/src/client/opamConfigCommand.ml b/src/client/opamConfigCommand.ml
index 87b44c1fd83..d69b646bee7 100644
--- a/src/client/opamConfigCommand.ml
+++ b/src/client/opamConfigCommand.ml
@@ -70,6 +70,7 @@ let possibly_unix_path_env_value k v =
 let rec print_env = function
   | [] -> ()
   | (k, v, comment) :: r ->
+    OpamConsole.disable_carriage_return ();
     if OpamConsole.verbose () then
       OpamStd.Option.iter (OpamConsole.msg ": %s;\n") comment;
     if not (List.exists (fun (k1, _, _) -> k = k1) r) || OpamConsole.verbose ()