diff --git a/CHANGELOG.md b/CHANGELOG.md
index 125c78ccb..64b2fba72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 IMPROVEMENTS:
 
   - **New guest:** SmartOS
+  - core: Change wording from "error" to "warning" on SSH retry output
+    to convey actual meaning.
   - guests/omnios: Mount NFS capability [GH-3282]
 
 BUG FIXES:
diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 65c2f81e4..9ab36aa2a 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -83,7 +83,7 @@ module VagrantPlugins
             end
 
             if message
-              @machine.ui.detail("Error: #{message} Retrying...")
+              @machine.ui.detail("Warning: #{message} Retrying...")
             end
           end
         end