diff --git a/config.go b/config.go
index 207662e4d..671f75b1f 100644
--- a/config.go
+++ b/config.go
@@ -42,9 +42,9 @@ const defaultConfig = `
 	"provisioners": {
 		"chef-solo": "packer-provisioner-chef-solo",
 		"file": "packer-provisioner-file",
+		"puppet-masterless": "packer-provisioner-puppet-masterless",
 		"shell": "packer-provisioner-shell",
-		"salt-masterless": "packer-provisioner-salt-masterless",
-    "puppet": "packer-provisioner-puppet"
+		"salt-masterless": "packer-provisioner-salt-masterless"
 	}
 }
 `
diff --git a/plugin/provisioner-puppet-masterless/main.go b/plugin/provisioner-puppet-masterless/main.go
new file mode 100644
index 000000000..c510cbb78
--- /dev/null
+++ b/plugin/provisioner-puppet-masterless/main.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"github.com/mitchellh/packer/packer/plugin"
+	"github.com/mitchellh/packer/provisioner/puppet-masterless"
+)
+
+func main() {
+	plugin.ServeProvisioner(new(puppetmasterless.Provisioner))
+}
diff --git a/plugin/provisioner-puppet-masterless/main_test.go b/plugin/provisioner-puppet-masterless/main_test.go
new file mode 100644
index 000000000..06ab7d0f9
--- /dev/null
+++ b/plugin/provisioner-puppet-masterless/main_test.go
@@ -0,0 +1 @@
+package main
diff --git a/plugin/provisioner-puppet/main.go b/plugin/provisioner-puppet/main.go
deleted file mode 100644
index 09f330bce..000000000
--- a/plugin/provisioner-puppet/main.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package main
-
-import (
-	"github.com/mitchellh/packer/packer/plugin"
-	"github.com/mitchellh/packer/provisioner/puppet"
-)
-
-func main() {
-	plugin.ServeProvisioner(new(puppet.Provisioner))
-}
diff --git a/provisioner/puppet/provisioner.go b/provisioner/puppet-masterless/provisioner.go
similarity index 99%
rename from provisioner/puppet/provisioner.go
rename to provisioner/puppet-masterless/provisioner.go
index 5eb6d7320..868e771cf 100644
--- a/provisioner/puppet/provisioner.go
+++ b/provisioner/puppet-masterless/provisioner.go
@@ -1,6 +1,6 @@
 // This package implements a provisioner for Packer that executes
 // Puppet within the remote machine
-package puppet
+package puppetmasterless
 
 import (
 	"bytes"
diff --git a/provisioner/puppet/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go
similarity index 93%
rename from provisioner/puppet/provisioner_test.go
rename to provisioner/puppet-masterless/provisioner_test.go
index 8e62e4649..e2e4b3c96 100644
--- a/provisioner/puppet/provisioner_test.go
+++ b/provisioner/puppet-masterless/provisioner_test.go
@@ -1,4 +1,4 @@
-package puppet
+package puppetmasterless
 
 import (
 	"github.com/mitchellh/packer/packer"