diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed052dfa3..d80f3f373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ## Fixed
 
 - fixed empty lines for ZyXEL GS1900 switches (@jluebbe)
+- fixed prompt for Watchguard FirewareOS not matching the regex when the node is non-master (@netdiver)
 
 ## [0.29.1 - 2023-04-24]
 
diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb
index f735454d8..c2a9e26c4 100644
--- a/lib/oxidized/model/firewareos.rb
+++ b/lib/oxidized/model/firewareos.rb
@@ -1,7 +1,7 @@
 class FirewareOS < Oxidized::Model
   using Refinements
 
-  prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
+  prompt /^\[?\w*\]?\w*?(<[\w-]*>)?(#|>)\s*$/
   comment  '-- '
 
   cmd :all do |cfg|