diff --git a/playbook.yml b/playbook.yml
index 0e35fc2..477ff52 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -71,6 +71,7 @@
     - { role: hostsctl, tags: ['hostsctl'], when: "hostsctl is defined" }
     - { role: himawaripy, tags: ['himawaripy'], when: "himawaripy is defined" }
     - { role: kiwix, tags: ['kiwix'] }
+    - { role: dvorak, tags: ['dvorak'] }
   vars_prompt:
     - name: user_password
       prompt: "Enter desired user password"
diff --git a/roles/dvorak/files/40-libinput.conf b/roles/dvorak/files/40-libinput.conf
new file mode 100644
index 0000000..58e1823
--- /dev/null
+++ b/roles/dvorak/files/40-libinput.conf
@@ -0,0 +1,9 @@
+Section "InputClass"
+        Identifier "libinput keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+        Option "XkbLayout" "us"
+        Option "XkbVariant" "dvorak"
+        Option "XkbOptions" "ctrl:nocaps"
+EndSection
diff --git a/roles/dvorak/files/dvorak-cc.map.gz b/roles/dvorak/files/dvorak-cc.map.gz
new file mode 100644
index 0000000..2561d47
Binary files /dev/null and b/roles/dvorak/files/dvorak-cc.map.gz differ
diff --git a/roles/dvorak/files/vconsole.conf b/roles/dvorak/files/vconsole.conf
new file mode 100644
index 0000000..d7aba05
--- /dev/null
+++ b/roles/dvorak/files/vconsole.conf
@@ -0,0 +1 @@
+KEYMAP=dvorak-cc
diff --git a/roles/dvorak/tasks/main.yml b/roles/dvorak/tasks/main.yml
new file mode 100644
index 0000000..ab1dd50
--- /dev/null
+++ b/roles/dvorak/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Enable dvorak for XOrg libinput
+  copy: src=40-libinput.conf dest=/etc/X11/xorg.conf.d/40-libinput.conf
+
+- name: Add control-caps dvorak keymap
+  copy: src=dvorak-cc.map.gz .conf dest=/usr/share/kbd/keymaps/i386/dvorak-cc.map.gz
+
+- name: Enable dvorak-cc for vconsole
+  copy: src=vconsole.conf dest=/etc/vconsole.conf
+