diff --git a/CHANGELOG.md b/CHANGELOG.md
index 617f8bddf..229665dab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Added
 
 ### Changed
+- fsos: Add `cmd :all` block to strip carriage returns and command echo/prompts
 
 ### Fixed
 - siklu: allow parenthesis in prompt. Fixes #3841 (@ytti)
diff --git a/lib/oxidized/model/fsos.rb b/lib/oxidized/model/fsos.rb
index d05401bdd..811007d0d 100644
--- a/lib/oxidized/model/fsos.rb
+++ b/lib/oxidized/model/fsos.rb
@@ -10,6 +10,11 @@ class FSOS < Oxidized::Model
     data.sub re, ''
   end
 
+  cmd :all do |cfg|
+    cfg = cfg.delete("\r")
+    cfg.cut_both
+  end
+
   cmd :secret do |cfg|
     cfg.gsub! /(secret \w+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'