diff --git a/CHANGELOG.md b/CHANGELOG.md
index a37ad40ed..bc5809070 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ IMPROVEMENTS:
   - core: allow removal of all box versions with `--all` flag [GH-3462]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
+  - communicators/winrm: Configurable execution time limit [GH-6213]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether
diff --git a/website/docs/source/v2/vagrantfile/winrm_settings.html.md b/website/docs/source/v2/vagrantfile/winrm_settings.html.md
index add316a40..db1ced243 100644
--- a/website/docs/source/v2/vagrantfile/winrm_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/winrm_settings.html.md
@@ -46,10 +46,16 @@ to use port 4567 to talk to the guest if there is no other option.
 
 <hr>
 
+`config.winrm.execution_time_limit` - The maximum duration that a WinRM
+task can execute for. This defaults to two hours. The format of this value
+must be in this [Microsoft-documented format](https://msdn.microsoft.com/en-us/library/aa382678.aspx).
+
+<hr>
+
 <strong>Warning:</strong> In order for Vagrant to communicate with a Windows
 guest, you must allow unencrypted WinRM connections on the guest machine
 itself. Some public boxes already have this configured, but if you are
-attempting to `vagrant up` a Windows box and the command hangs at 
+attempting to `vagrant up` a Windows box and the command hangs at
 `Waiting for WinRM to become available...`, then you will need to run the
 commands below on the guest machine itself, at the box setup stage,
 after provisioning, or through a start up script.
@@ -57,4 +63,4 @@ after provisioning, or through a start up script.
 <pre class="prettyprint">
 Set-Item WSMan:\localhost\Service\AllowUnencrypted -Value True
 Set-Item WSMan:\localhost\Service\Auth\Basic -Value True
-</pre>
\ No newline at end of file
+</pre>