diff --git a/.github/workflows/outboards/boards/willis b/.github/workflows/outboards/boards/willis
new file mode 100644
index 000000000..69ef7ea1c
--- /dev/null
+++ b/.github/workflows/outboards/boards/willis
@@ -0,0 +1,4 @@
+# Copyright 2024 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_modules=krikun98/willis-zmk-module/main
diff --git a/.github/workflows/test-all-boards.yml b/.github/workflows/test-all-boards.yml
index ca01d1e1c..a772d3bef 100644
--- a/.github/workflows/test-all-boards.yml
+++ b/.github/workflows/test-all-boards.yml
@@ -30,6 +30,7 @@ jobs:
         "sporkus_le_capybara",
         "technikable",
         "tipper_tf",
+        "willis",
         "zaphod"
       ]'
 
diff --git a/config/willis.keymap b/config/willis.keymap
new file mode 100644
index 000000000..84de8031c
--- /dev/null
+++ b/config/willis.keymap
@@ -0,0 +1,6 @@
+// Copyright 2024 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/36/willis.h"
+#include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/36/willis.h b/miryoku/mapping/36/willis.h
new file mode 100644
index 000000000..f47f66b12
--- /dev/null
+++ b/miryoku/mapping/36/willis.h
@@ -0,0 +1,65 @@
+// Copyright 2024 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#if !defined (MIRYOKU_LAYOUTMAPPING_WILLIS)
+
+#define XXX &none
+
+#if defined (MIRYOKU_MAPPING_2X2U)
+#define MIRYOKU_LAYOUTMAPPING_WILLIS( \
+K00, K01, K02, K03, K04,      K05, K06, K07, K08, K09, \
+K10, K11, K12, K13, K14,      K15, K16, K17, K18, K19, \
+K20, K21, K22, K23, K24,      K25, K26, K27, K28, K29, \
+N30, N31, K32, K33, K34,      K35, K36, K37, N38, N39 \
+) \
+K00  K01  K02  K03  K04       K05  K06  K07  K08  K09 \
+K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 \
+K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
+          K34       K33       K36       K35
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 30 31
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS
+
+#else
+#define MIRYOKU_LAYOUTMAPPING_WILLIS( \
+K00, K01, K02, K03, K04,      K05, K06, K07, K08, K09, \
+K10, K11, K12, K13, K14,      K15, K16, K17, K18, K19, \
+K20, K21, K22, K23, K24,      K25, K26, K27, K28, K29, \
+N30, N31, K32, K33, K34,      K35, K36, K37, N38, N39 \
+) \
+K00  K01  K02  K03  K04       K05  K06  K07  K08  K09 \
+K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 \
+K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
+          K32  K33  K34       K35  K36  K37
+
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTPINKIE 1 2
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTINNERINDEX 2 3
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTINNERINDEX 6 7
+#define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTPINKIE 7 8
+
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_LEFTPINKIE 21 22
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_LEFTINNERINDEX 22 23
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_RIGHTINNERINDEX 26 27
+#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_RIGHTPINKIE 27 28
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 31 32
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 33 34
+
+#endif
+
+/ {
+  chosen {
+      zmk,physical-layout =
+#if defined MIRYOKU_MAPPING_2X2U
+      &willis_bruce_layout;
+#else
+      &willis_minidox_layout;
+#endif
+  };
+};
+
+#endif
+
+#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_WILLIS
diff --git a/readme.org b/readme.org
index 8a13842ab..1cbf068af 100644
--- a/readme.org
+++ b/readme.org
@@ -365,6 +365,21 @@ Notes or diagrams are provided below where the selection of keys is not obvious
 [[#thumb-combos][Thumb combos]] are enabled.
 
 
+**** 36/willis
+
+***** Bruce
+
+~MIRYOKU_MAPPING=2X2U~
+
+Supports Bruce/Le Chiffre 2x2u configuration.
+[[#thumb-combos][Thumb combos]] are enabled.
+
+***** Minidox
+
+Default.
+3x1U thumb keys.
+
+
 **** 38/draculad