diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index e5a9def090..1c36e73c45 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -161,7 +161,7 @@
     if $::operatingsystemrelease =~ /^7/ or $::operatingsystem == 'Fedora' {
       file { 'systemd-override':
         ensure  => present,
-        path    => '/etc/systemd/system/postgresql.service',
+        path    => "/etc/systemd/system/${postgresql::params::service_name}.service",
         owner   => root,
         group   => root,
         content => template('postgresql/systemd-override.erb'),
diff --git a/templates/systemd-override.erb b/templates/systemd-override.erb
index 1afb2a8e1d..39100585f4 100644
--- a/templates/systemd-override.erb
+++ b/templates/systemd-override.erb
@@ -1,4 +1,8 @@
+<% if @manage_package_repo and (scope.function_versioncmp([@version.to_s, '9.1']) >= 0) -%>
+.include /lib/systemd/system/postgresql-<%= @version %>.service
+<% else -%>
 .include /lib/systemd/system/postgresql.service
+<% end -%>
 [Service]
 Environment=PGPORT=<%= @port %>
 Environment=PGDATA=<%= @datadir %>