diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9ba9b196..85137a185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ BUG FIXES:
 * builder/virtualbox: sleep a bit before export to ensure the sesssion
   is unlocked. [GH-512]
 * builder/virtualbox: create SATA drives properly on VirtualBox 4.3 [GH-547]
+* builder/virtualbox: support user templates in SSH key path. [GH-539]
+* builder/vmware: support user templates in SSH key path. [GH-539]
 * communicator/ssh: Fix issue where a panic could arise from a nil
   dereference. [GH-525]
 * post-processor/vagrant: Fix issue with VirtualBox OVA. [GH-548]
diff --git a/builder/virtualbox/builder.go b/builder/virtualbox/builder.go
index 452a7de49..02bf0d727 100644
--- a/builder/virtualbox/builder.go
+++ b/builder/virtualbox/builder.go
@@ -154,6 +154,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		"iso_url":                 &b.config.RawSingleISOUrl,
 		"output_directory":        &b.config.OutputDir,
 		"shutdown_command":        &b.config.ShutdownCommand,
+		"ssh_key_path":            &b.config.SSHKeyPath,
 		"ssh_password":            &b.config.SSHPassword,
 		"ssh_username":            &b.config.SSHUser,
 		"virtualbox_version_file": &b.config.VBoxVersionFile,
diff --git a/builder/vmware/builder.go b/builder/vmware/builder.go
index 80627df56..25657c30d 100644
--- a/builder/vmware/builder.go
+++ b/builder/vmware/builder.go
@@ -148,6 +148,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		"iso_url":             &b.config.RawSingleISOUrl,
 		"output_directory":    &b.config.OutputDir,
 		"shutdown_command":    &b.config.ShutdownCommand,
+		"ssh_key_path":        &b.config.SSHKeyPath,
 		"ssh_password":        &b.config.SSHPassword,
 		"ssh_username":        &b.config.SSHUser,
 		"tools_upload_flavor": &b.config.ToolsUploadFlavor,