diff --git a/README.md b/README.md
index d5e3103fa..ae36eb2d5 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ See complete Ubuntu, Windows, and macOS templates in the [examples folder](https
 ### Provision
 
 * `communicator` - `ssh` (default), `winrm`, or `none` (create/clone, customize hardware, but do not boot).
-* `ip_wait_timeout`(string) - Amount of time to wait for VM's IP, similar to 'ssh_timeout'. Defaults to 5m (5 minutes). See the Go Lang [ParseDuration](https://golang.org/pkg/time/#ParseDuration) documentation for full details.
+* `ip_wait_timeout`(string) - Amount of time to wait for VM's IP, similar to 'ssh_timeout'. Defaults to 30m (30 minutes). See the Go Lang [ParseDuration](https://golang.org/pkg/time/#ParseDuration) documentation for full details.
 * `ip_settle_timeout`(string) - Amount of time to wait for VM's IP to settle down, sometimes VM may report incorrect IP initially, then its recommended to set that parameter to apx. 2 minutes. Examples 45s and 10m. Defaults to 5s(5 seconds). See the Go Lang [ParseDuration](https://golang.org/pkg/time/#ParseDuration) documentation for full details.
 * `ssh_username`(string) - Username in guest OS.
 * `ssh_password`(string) - Password to access guest OS. Only specify `ssh_password` or `ssh_private_key_file`, but not both.
diff --git a/common/step_wait_for_ip.go b/common/step_wait_for_ip.go
index 930096136..3856082fc 100644
--- a/common/step_wait_for_ip.go
+++ b/common/step_wait_for_ip.go
@@ -28,8 +28,7 @@ func (c *WaitIpConfig) Prepare() []error {
 		c.SettleTimeout = 5 * time.Second
 	}
 	if c.WaitTimeout == 0 {
-		// Same default value as default timeout for 'ssh_timeout' in StepConnect
-		c.WaitTimeout = 5 * time.Minute
+		c.WaitTimeout = 30 * time.Minute
 	}
 
 	return errs