diff --git a/conf/puppet.conf b/conf/puppet.conf
new file mode 100644
index 000000000..4a8ae4c2f
--- /dev/null
+++ b/conf/puppet.conf
@@ -0,0 +1,9 @@
+[main]
+    # Where Puppet stores dynamic and growing data.
+    vardir=/opt/puppetlabs/agent/cache
+
+    # The Puppet log directory.
+    logdir=/var/log/puppetlabs/agent
+
+    # Where Puppet PID files are kept.
+    rundir=/var/run/puppetlabs
diff --git a/ext/debian/puppet.conf b/ext/debian/puppet.conf
deleted file mode 100644
index 5b8157274..000000000
--- a/ext/debian/puppet.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[main]
-logdir=/var/log/puppetlabs/agent
-vardir=/opt/puppetlabs/agent/cache
-ssldir=$vardir/ssl
-rundir=/var/run/puppetlabs/agnet
-factpath=$vardir/lib/facter
-templatedir=$confdir/templates
-
-[master]
-# These are needed when the puppetmaster is run by passenger
-# and can safely be removed if webrick is used.
-ssl_client_header = SSL_CLIENT_S_DN
-ssl_client_verify_header = SSL_CLIENT_VERIFY
-
diff --git a/ext/debian/puppet.conf b/ext/debian/puppet.conf
new file mode 120000
index 000000000..95ebaf6c4
--- /dev/null
+++ b/ext/debian/puppet.conf
@@ -0,0 +1 @@
+../../conf/puppet.conf
\ No newline at end of file
diff --git a/ext/gentoo/puppet/puppet.conf b/ext/gentoo/puppet/puppet.conf
deleted file mode 100644
index 4ed08ff10..000000000
--- a/ext/gentoo/puppet/puppet.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-[main]
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppetlabs/agent
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppetlabs/agent
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-[puppetd]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
diff --git a/ext/gentoo/puppet/puppet.conf b/ext/gentoo/puppet/puppet.conf
new file mode 120000
index 000000000..a12b7da15
--- /dev/null
+++ b/ext/gentoo/puppet/puppet.conf
@@ -0,0 +1 @@
+../../../conf/puppet.conf
\ No newline at end of file
diff --git a/ext/ips/puppet.conf b/ext/ips/puppet.conf
deleted file mode 100644
index 101ab79b8..000000000
--- a/ext/ips/puppet.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[main]
-    vardir = /opt/puppetlabs/agent/cache
-
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppetlabs/agent
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppetlabs/agent
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
diff --git a/ext/ips/puppet.conf b/ext/ips/puppet.conf
new file mode 120000
index 000000000..95ebaf6c4
--- /dev/null
+++ b/ext/ips/puppet.conf
@@ -0,0 +1 @@
+../../conf/puppet.conf
\ No newline at end of file
diff --git a/ext/redhat/puppet.conf b/ext/redhat/puppet.conf
deleted file mode 100644
index 843740579..000000000
--- a/ext/redhat/puppet.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-[main]
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppetlabs/agent
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppetlabs/agent
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
diff --git a/ext/redhat/puppet.conf b/ext/redhat/puppet.conf
new file mode 120000
index 000000000..95ebaf6c4
--- /dev/null
+++ b/ext/redhat/puppet.conf
@@ -0,0 +1 @@
+../../conf/puppet.conf
\ No newline at end of file