diff --git a/playbook.yml b/playbook.yml
index 3b6bb213..5fc720b4 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -9,3 +9,8 @@
   become: true
   roles:
     - games
+- name: setup libreoffice hosts
+  hosts: libreoffice_hosts
+  become: true
+  roles:
+    - libreoffice
diff --git a/roles/games/tasks/main.yml b/roles/games/tasks/main.yml
index 911d5ec7..33d69c6d 100644
--- a/roles/games/tasks/main.yml
+++ b/roles/games/tasks/main.yml
@@ -6,7 +6,6 @@
       - supertuxkart
       - gnuchess
       - sauerbraten
-      - assaultcube
       - minetest
       - mari0
       - retroarch
diff --git a/roles/general/tasks/main.yml b/roles/general/tasks/main.yml
index 3d6a5c96..b350ad31 100644
--- a/roles/general/tasks/main.yml
+++ b/roles/general/tasks/main.yml
@@ -37,21 +37,6 @@
       # browsers
       - chromium
 
-      # office software
-      - ttf-liberation
-      - libreoffice-fresh
-      - libreoffice-fresh-de
-      - libreoffice-fresh-eo
-      - libreoffice-fresh-es
-      - libreoffice-fresh-nl
-
-      # spelling software
-      - hunspell
-      - hunspell-de
-      - hunspell-es_es
-      - hunspell-en_US
-      - hunspell-nl
-
       # video/picture manipulation
       - gimp
       - blender
diff --git a/roles/hunspell/tasks/main.yml b/roles/hunspell/tasks/main.yml
new file mode 100644
index 00000000..f41e421d
--- /dev/null
+++ b/roles/hunspell/tasks/main.yml
@@ -0,0 +1,10 @@
+- name: install hunspell
+  community.general.pacman:
+    name: hunspell
+    state: present
+
+- name: install hunspell language packages
+  community.general.pacman:
+    name: "hunspell-{{ item }}"
+    state: present
+  loop: "{{hunspell_languages}}"
diff --git a/roles/libreoffice/meta/main.yml b/roles/libreoffice/meta/main.yml
new file mode 100644
index 00000000..a17ee3d0
--- /dev/null
+++ b/roles/libreoffice/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+- hunspell
diff --git a/roles/libreoffice/tasks/main.yml b/roles/libreoffice/tasks/main.yml
new file mode 100644
index 00000000..5a7d15a7
--- /dev/null
+++ b/roles/libreoffice/tasks/main.yml
@@ -0,0 +1,12 @@
+- name: install libreoffice
+  community.general.pacman:
+    name:
+      - ttf-liberation
+      - libreoffice-fresh
+    state: present
+
+- name: install libreoffice language packages
+  community.general.pacman:
+    name: "libreoffice-fresh-{{ item }}"
+    state: present
+  loop: "{{libreoffice_languages}}"