diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go
index 04676fa71..0166827f0 100644
--- a/provisioner/puppet-server/provisioner.go
+++ b/provisioner/puppet-server/provisioner.go
@@ -23,10 +23,17 @@ type Config struct {
 	// A path to a directory containing the client private keys
 	ClientPrivateKeyPath string `mapstructure:"client_private_key_path"`
 
-	PuppetNode   string `mapstructure:"puppet_node"`
+	// The hostname of the Puppet node.
+	PuppetNode string `mapstructure:"puppet_node"`
+
+	// The hostname of the Puppet server.
 	PuppetServer string `mapstructure:"puppet_server"`
-	Options      string `mapstructure:"options"`
 
+	// Additional options to be passed to `puppet agent`.
+	Options string `mapstructure:"options"`
+
+	// The directory where files will be uploaded. Packer requires write
+	// permissions in this directory.
 	StagingDir string `mapstructure:"staging_dir"`
 }
 
diff --git a/website/source/docs/provisioners/puppet-server.html.markdown b/website/source/docs/provisioners/puppet-server.html.markdown
index 5b6d7a7ae..d9c4bdc8e 100644
--- a/website/source/docs/provisioners/puppet-server.html.markdown
+++ b/website/source/docs/provisioners/puppet-server.html.markdown
@@ -1,9 +1,9 @@
 ---
 layout: "docs"
-page_title: "Puppet Provisioner"
+page_title: "Puppet Server Provisioner"
 ---
 
-# Puppet Provisioner
+# Puppet Server Provisioner
 
 Type: `puppet-server`