diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 434af01..5fa5880 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -66,6 +66,9 @@ v0.2.8
 - Remove ``d([])`` from ``common.yml`` playbook to pass the variables correctly
   between roles. [drybjed]
 
+- Add ``debops.cryptsetup`` role, which can be used to manage filesystems
+  encrypted using LUKS. Role was created by Robin Schneider. Thanks! [drybjed]
+
 v0.2.7
 ------
 
diff --git a/galaxy/requirements.txt b/galaxy/requirements.txt
index b7f6514..87a3e16 100644
--- a/galaxy/requirements.txt
+++ b/galaxy/requirements.txt
@@ -7,6 +7,7 @@ debops.bootstrap
 debops.boxbackup
 debops.console
 debops.core
+debops.cryptsetup
 debops.debops
 debops.dhcpd
 debops.dhparam
diff --git a/playbooks/service/cryptsetup.yml b/playbooks/service/cryptsetup.yml
new file mode 100644
index 0000000..38d1579
--- /dev/null
+++ b/playbooks/service/cryptsetup.yml
@@ -0,0 +1,11 @@
+---
+
+- name: Configure encrypted filesystems
+  hosts: [ 'debops_service_cryptsetup' ]
+  become: True
+
+  roles:
+
+    - role: debops.cryptsetup
+      tags: [ 'role::cryptsetup' ]
+
diff --git a/playbooks/sys/all.yml b/playbooks/sys/all.yml
index b098e2b..d3e85af 100644
--- a/playbooks/sys/all.yml
+++ b/playbooks/sys/all.yml
@@ -12,6 +12,8 @@
 
 - include: iscsi.yml
 
+- include: cryptsetup.yml
+
 - include: nfs.yml
 
 
diff --git a/playbooks/sys/cryptsetup.yml b/playbooks/sys/cryptsetup.yml
new file mode 120000
index 0000000..eae9ddc
--- /dev/null
+++ b/playbooks/sys/cryptsetup.yml
@@ -0,0 +1 @@
+../service/cryptsetup.yml
\ No newline at end of file