diff --git a/bin/install-ansible b/bin/install-ansible
index 98189a5..196562e 100755
--- a/bin/install-ansible
+++ b/bin/install-ansible
@@ -4,9 +4,7 @@ set -e
 
 source /etc/os-release
 if [[ $ID = "amzn" ]]; then
-    amazon-linux-extras enable postgresql9.6
     yum install -y \
-        postgresql \
         python3-devel \
         python3-pip \
         python2-boto3 \
diff --git a/roles/fetch_backups/tasks/amazon.yml b/roles/fetch_backups/tasks/amazon.yml
new file mode 100644
index 0000000..bf32125
--- /dev/null
+++ b/roles/fetch_backups/tasks/amazon.yml
@@ -0,0 +1,7 @@
+---
+
+# Amazon Linux 2 supplies extra packages via a special command.
+- name: Enable Postgresql from 'extras'
+  command: amazon-linux-extras install -y "postgresql{{ postgres_version }}"
+  args:
+    creates: /usr/bin/psql
diff --git a/roles/fetch_backups/tasks/main.yml b/roles/fetch_backups/tasks/main.yml
index 16b18b8..27c5efe 100644
--- a/roles/fetch_backups/tasks/main.yml
+++ b/roles/fetch_backups/tasks/main.yml
@@ -69,4 +69,7 @@
         object: "{{ atl_backup_manifest.shared_home_dump | urlsplit('path') }}"
         dest: "{{ atl_backup_home_dest }}"
 
+    - name: Install distro-specific restore support packages
+      include_tasks: "{{ ansible_distribution|lower }}.yml"
+
   when: atl_backup_manifest_url is defined and atl_backup_manifest_url != ''