diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index 2845cab377..4c82e204a5 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -15,6 +15,7 @@
   $version                    = $postgresql::server::_version
   $manage_pg_hba_conf         = $postgresql::server::manage_pg_hba_conf
   $manage_pg_ident_conf       = $postgresql::server::manage_pg_ident_conf
+  $datadir                    = $postgresql::server::datadir
 
   if ($manage_pg_hba_conf == true) {
     # Prepare the main pg_hba file
@@ -101,6 +102,10 @@
     value => $port,
   }
 
+  postgresql::server::config_entry { 'data_directory':
+    value => $datadir,
+  }
+
   # RedHat-based systems hardcode some PG* variables in the init script, and need to be overriden
   # in /etc/sysconfig/pgsql/postgresql. Create a blank file so we can manage it with augeas later.
   if ($::osfamily == 'RedHat') and ($::operatingsystemrelease !~ /^7/) and ($::operatingsystem != 'Fedora') {