diff --git a/cluster/vsphere/config-common.sh b/cluster/vsphere/config-common.sh
index 2bebd8e5f74..0c918486a46 100644
--- a/cluster/vsphere/config-common.sh
+++ b/cluster/vsphere/config-common.sh
@@ -24,11 +24,11 @@ function public-key {
     fi
   done
 
-  echo "Can't find public key file..."
+  echo "Can't find public key file..." 1>&2
   exit 1
 }
 
-DISK=kube.vmdk
+DISK=./kube/kube.vmdk
 GUEST_ID=debian7_64Guest
 PUBLIC_KEY_FILE=${PUBLIC_KEY_FILE-$(public-key)}
 SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null"
@@ -40,3 +40,7 @@ SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null"
 #export GOVC_RESOURCE_POOL=
 #export GOVC_NETWORK=
 #export GOVC_GUEST_LOGIN='kube:kube'
+
+# Set GOVC_INSECURE if the host in GOVC_URL is using a certificate that cannot
+# be verified (i.e. a self-signed certificate), but IS trusted.
+#export GOVC_INSECURE=1
diff --git a/docs/getting-started-guides/vsphere.md b/docs/getting-started-guides/vsphere.md
index 3ed916b5835..8d93041c584 100644
--- a/docs/getting-started-guides/vsphere.md
+++ b/docs/getting-started-guides/vsphere.md
@@ -41,16 +41,17 @@ Upload this VMDK to your vSphere instance:
 
 ```sh
 export GOVC_URL='https://user:pass@hostname/sdk'
+export GOVC_INSECURE=1 # If the host above uses a self-signed cert
 export GOVC_DATASTORE='target datastore'
-export GOVC_RESOURCE_POOL='resource pool with access to datastore'
+export GOVC_RESOURCE_POOL='resource pool or cluster with access to datastore'
 
-govc datastore.import kube.vmdk
+govc import.vmdk kube.vmdk ./kube/
 ```
 
 Verify that the VMDK was correctly uploaded and expanded to 10GiB:
 
 ```sh
-govc datastore.ls
+govc datastore.ls ./kube/
 ```
 
 Take a look at the file `cluster/vsphere/config-common.sh` fill in the required