diff --git a/util/dev-puppet-master b/util/dev-puppet-master
index 92ec9c598..f2cfa32ec 100755
--- a/util/dev-puppet-master
+++ b/util/dev-puppet-master
@@ -1,23 +1,23 @@
 #/bin/sh
 name="default"
  
 if [ $# -gt 0 ]; then
     name=$1
     shift 1
 fi
- 
+
 export dir="${HOME}/test/master/${name}"
 mkdir -p ${dir}
  
 if [ ! -f $dir/auth.conf ]; then
   # Edit this file to change default puppet authorizations.
-  cp ~/auth.conf "${dir}/auth.conf"
+  cp ./conf/auth.conf "${dir}/auth.conf"
 fi
 mkdir -p ${dir}/manifests
 touch ${dir}/manifests/site.pp
  
 # Work around Redmine #21908 where the master generates a warning if agent pluginsyncs
 # and there isn't at least one module with a libdir.
 mkdir -p ${dir}/modules/foo/lib
  
-bundle exec puppet master --no-daemonize --trace --autosign=true --debug --confdir=${dir} --vardir=${dir} --certname puppetmaster $@
+bundle exec puppet master --no-daemonize --autosign=true --confdir=${dir} --vardir=${dir} --certname puppetmaster $@