diff --git a/roles/mastodon-postgresql/tasks/main.yml b/roles/mastodon-postgresql/tasks/main.yml
new file mode 100644
index 0000000..55a557e
--- /dev/null
+++ b/roles/mastodon-postgresql/tasks/main.yml
@@ -0,0 +1,17 @@
+--
+# This role installs the PostgreSQL server daemon and creates the mastodon
+# database user
+
+- name: Install PostgreSQL server and related packages
+  apt: name={{ item }} state=latest update_cache=yes
+  with_items:
+     - postgresql
+     - postgresql-contrib
+     - python-psycopg2
+- name: Add Mastodon PostgreSQL database user
+  postgresql_user:
+    name: mastodon
+    role_attr_flags: CREATEDB
+    state: present
+  become: true
+  become_user: postgres
diff --git a/site.yml b/site.yml
index 9503f0f..35cc788 100644
--- a/site.yml
+++ b/site.yml
@@ -5,3 +5,4 @@
     - common
     - ruby
     - mastodon-app
+    - mastodon-postgresql