diff --git a/config.go b/config.go
index dac02d0cd..a53aecafa 100644
--- a/config.go
+++ b/config.go
@@ -39,7 +39,7 @@ const defaultConfig = `
 	"provisioners": {
 		"file": "packer-provisioner-file",
 		"shell": "packer-provisioner-shell",
-		"salt": "packer-provisioner-salt"
+		"salt-masterless": "packer-provisioner-salt-masterless"
 	}
 }
 `
diff --git a/plugin/provisioner-salt-masterless/main.go b/plugin/provisioner-salt-masterless/main.go
new file mode 100644
index 000000000..8547a7a88
--- /dev/null
+++ b/plugin/provisioner-salt-masterless/main.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"github.com/mitchellh/packer/packer/plugin"
+	"github.com/mitchellh/packer/provisioner/salt-masterless"
+)
+
+func main() {
+	plugin.ServeProvisioner(new(saltMasterless.Provisioner))
+}
diff --git a/plugin/provisioner-salt/main.go b/plugin/provisioner-salt/main.go
deleted file mode 100644
index 622611e67..000000000
--- a/plugin/provisioner-salt/main.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package main
-
-import (
-	"github.com/mitchellh/packer/packer/plugin"
-	"github.com/mitchellh/packer/provisioner/salt"
-)
-
-func main() {
-	plugin.ServeProvisioner(new(salt.Provisioner))
-}
diff --git a/provisioner/salt/provisioner.go b/provisioner/salt-masterless/provisioner.go
similarity index 99%
rename from provisioner/salt/provisioner.go
rename to provisioner/salt-masterless/provisioner.go
index 961fe351a..6a0b1f189 100644
--- a/provisioner/salt/provisioner.go
+++ b/provisioner/salt-masterless/provisioner.go
@@ -1,6 +1,6 @@
 // This package implements a provisioner for Packer that executes a
 // saltstack highstate within the remote machine
-package salt
+package saltMasterless
 
 import (
 	"errors"
diff --git a/provisioner/salt/provisioner_test.go b/provisioner/salt-masterless/provisioner_test.go
similarity index 97%
rename from provisioner/salt/provisioner_test.go
rename to provisioner/salt-masterless/provisioner_test.go
index 0e3242d1f..99ce05d25 100644
--- a/provisioner/salt/provisioner_test.go
+++ b/provisioner/salt-masterless/provisioner_test.go
@@ -1,4 +1,4 @@
-package salt
+package saltMasterless
 
 import (
 	"github.com/mitchellh/packer/packer"
diff --git a/website/source/docs/provisioners/salt.html.markdown b/website/source/docs/provisioners/salt.html.markdown
index 239ad36b7..0ed1ea51e 100644
--- a/website/source/docs/provisioners/salt.html.markdown
+++ b/website/source/docs/provisioners/salt.html.markdown
@@ -2,11 +2,11 @@
 layout: "docs"
 ---
 
-# Salt Provisioner
+# Salt Masterless Provisioner
 
-Type: `salt`
+Type: `salt-masterless`
 
-The salt provisioner provisions machines built by Packer using [Salt](http://saltstack.com/) states.
+The salt-masterless provisioner provisions machines built by Packer using [Salt](http://saltstack.com/) states.
 
 ## Basic Example
 
@@ -14,7 +14,7 @@ The example below is fully functional.
 
 <pre class="prettyprint">
 {
-    "type": "salt",
+    "type": "salt-masterless",
     "bootstrap_args": "git v0.16.0"
     "local_state_tree": "/Users/me/salt"
 }