diff --git a/servers/puppet/manifests/site.pp b/servers/puppet/manifests/site.pp
index a28a20302e..7b01e70923 100644
--- a/servers/puppet/manifests/site.pp
+++ b/servers/puppet/manifests/site.pp
@@ -322,6 +322,24 @@ class humbug_postgres {
     mode   => 644
   }
 
+  file { "/etc/postgresql/9.1/main/postgresql.conf":
+    require => Package["postgresql-9.1"],
+    ensure => file,
+    owner  => "postgres",
+    group  => "postgres",
+    mode => 644,
+    source => "/root/humbug/servers/puppet/files/postgresql/postgresql.conf",
+  }
+
+  file { "/etc/postgresql/9.1/main/pg_hba.conf":
+    require => Package["postgresql-9.1"],
+    ensure => file,
+    owner  => "postgres",
+    group  => "postgres",
+    mode => 640,
+    source => "/root/humbug/servers/puppet/files/postgresql/pg_hba.conf",
+  }
+
   common::append_if_no_such_line { 'shmmax':
     require    => Package['postgresql-9.1'],
     file       => '/etc/sysctl.d/30-postgresql-shm.conf',