diff --git a/playbook.yml b/playbook.yml
index 664a5ad..e4f9237 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -49,6 +49,7 @@
     - { role: mail, tags: ['mail'] }
     - { role: cups, tags: ['cups'] }
     - { role: office, tags: ['office'] }
+    - { role: pdf, tags: ['pdf'] }
     - { role: redshift, tags: ['redshift'] }
     - { role: rtorrent, tags: ['rtorrent'] }
     - { role: virtualbox, tags: ['virtualbox'] }
diff --git a/roles/office/tasks/main.yml b/roles/office/tasks/main.yml
index 6797a51..e0fa3c6 100644
--- a/roles/office/tasks/main.yml
+++ b/roles/office/tasks/main.yml
@@ -30,59 +30,6 @@
   tags:
     - firejail
 
-- name: Install Okular
-  pacman:
-      name: okular
-      state: present
-  tags:
-    - okular
-
-- name: Jail Okular
-  file:
-      src: /usr/bin/firejail
-      dest: /usr/local/bin/okular
-      state: link
-  tags:
-    - firejail
-    - okular
-
-- name: Verify Okular firejail local profile exists
-  file:
-      path: /etc/firejail/okular.local
-      state: touch
-  tags:
-    - firejail
-    - okular
-
-- name: Restrict Okular network access
-  lineinfile:
-    dest: /etc/firejail/okular.local
-    regexp: "^net"
-    line: "net none"
-  tags:
-    - firejail
-    - okular
-
-- name: Install Zathura and dependencies
-  pacman: name={{ item }} state=present
-  with_items:
-    - zathura-pdf-mupdf
-    - zathura-ps
-
-- name: Set Zathura as default PDF viewer
-  lineinfile:
-      dest: /etc/xdg/mimeapps.list
-      regexp: ^application/pdf
-      state: present
-      line: "application/pdf=org.pwmt.zathura-pdf-mupdf.desktop"
-
-- name: Jail Zathura
-  file: src=/usr/bin/firejail
-        dest=/usr/local/bin/zathura
-        state=link
-  tags:
-    - firejail
-
 - name: Install enscript
   pacman: name=enscript state=present
 
@@ -98,9 +45,6 @@
 - name: Install texlive-latexextra
   pacman: name=texlive-latexextra state=present
 
-- name: Install pdfgrep
-  pacman: name=pdfgrep state=present
-
 - name: Install visidata
   aur: name=visidata user={{ user.name }}
   tags:
diff --git a/roles/pdf/tasks/main.yml b/roles/pdf/tasks/main.yml
new file mode 100644
index 0000000..f65e754
--- /dev/null
+++ b/roles/pdf/tasks/main.yml
@@ -0,0 +1,68 @@
+---
+- name: Install Okular
+  pacman:
+    name: okular
+    state: present
+  tags:
+    - okular
+
+- name: Jail Okular
+  file:
+    src: /usr/bin/firejail
+    dest: /usr/local/bin/okular
+    state: link
+  tags:
+    - okular
+    - firejail
+
+- name: Verify Okular firejail local profile exists
+  file:
+    path: /etc/firejail/okular.local
+    state: touch
+  tags:
+    - okular
+    - firejail
+
+- name: Restrict Okular network access
+  lineinfile:
+    dest: /etc/firejail/okular.local
+    regexp: "^net"
+    line: "net none"
+  tags:
+    - okular
+    - firejail
+
+- name: Install Zathura and dependencies
+  pacman:
+    name:
+      - zathura-pdf-mupdf
+      - zathura-ps
+    state: present
+  tags:
+    - zathura
+
+- name: Set Zathura as default PDF viewer
+  lineinfile:
+    dest: /etc/xdg/mimeapps.list
+    regexp: "^application/pdf"
+    state: present
+    line: "application/pdf=org.pwmt.zathura-pdf-mupdf.desktop"
+  tags:
+    - zathura
+
+- name: Jail Zathura
+  file:
+    src: /usr/bin/firejail
+    dest: /usr/local/bin/zathura
+    state: link
+  tags:
+    - zathura
+    - firejail
+
+
+- name: Install pdfgrep
+  pacman:
+    name: pdfgrep
+    state: present
+  tags:
+    - pdfgrep