diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go
index df00804a2..cfd96b05a 100644
--- a/builtin/providers/aws/resource_aws_instance.go
+++ b/builtin/providers/aws/resource_aws_instance.go
@@ -88,6 +88,10 @@ func resource_aws_instance_create(
 
 	instance = instanceRaw.(*ec2.Instance)
 
+	// Initialize the connection info
+	rs.ConnInfo.Raw["type"] = "ssh"
+	rs.ConnInfo.Raw["host"] = instance.PublicIpAddress
+
 	// Set our attributes
 	rs, err = resource_aws_instance_update_state(rs, instance)
 	if err != nil {