diff --git a/ext/debian/puppet.conf b/ext/debian/puppet.conf
index 312b5675f..79830082e 100644
--- a/ext/debian/puppet.conf
+++ b/ext/debian/puppet.conf
@@ -1,14 +1,14 @@
 [main]
 logdir=/var/log/puppet
 vardir=/var/lib/puppet
-ssldir=/var/lib/puppet/ssl
+ssldir=$vardir/ssl
 rundir=/var/run/puppet
 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_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY