diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index 7f3b224..51f7bf1 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -10,6 +10,7 @@ rundir=/var/run/puppet
 factsignore = .svn CVS .git
 pluginsync=true
 factpath=$vardir/lib/facter
+hiera_config=/etc/puppet/hiera.yaml
 
 <% if server == "true" -%>
 [master]
@@ -27,6 +28,7 @@ storeconfigs=<%= scope['puppet::storeconfigs'] %>
 storeconfigs_backend=<%= scope['puppet::storeconfigs_backend'] %>
 <% end -%>
 <% end -%>
+hiera_config=/etc/puppet/hiera.yaml
 
 [agent]
 # Make sure all log messages are sent to the right directory