diff --git a/.github/workflows/outboards/shields/kpukboard b/.github/workflows/outboards/shields/kpukboard
new file mode 100644
index 0000000..0a88d07
--- /dev/null
+++ b/.github/workflows/outboards/shields/kpukboard
@@ -0,0 +1,7 @@
+# Copyright 2023 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=kriku/kpukboard-zmk
+outboard_ref=main
+outboard_from=config/boards/shields/kpukboard
+outboard_to=boards/shields/kpukboard
diff --git a/.github/workflows/test-all-xiao-shields.yml b/.github/workflows/test-all-xiao-shields.yml
index 3e8ebf6..147f735 100644
--- a/.github/workflows/test-all-xiao-shields.yml
+++ b/.github/workflows/test-all-xiao-shields.yml
@@ -13,6 +13,7 @@ jobs:
       shield: '[
         "clog_v2_left","clog_v2_right",
         "hummingbird",
+        "kpukboard_left","kpukboard_right",
         "revxlp",
         "rommana_left","rommana_right",
         "totem_left","totem_right",
diff --git a/config/kpukboard.keymap b/config/kpukboard.keymap
new file mode 100644
index 0000000..c609f8e
--- /dev/null
+++ b/config/kpukboard.keymap
@@ -0,0 +1,6 @@
+// Copyright 2023 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/38/kpukboard.h"
+#include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/38/kpukboard.h b/miryoku/mapping/38/kpukboard.h
new file mode 100644
index 0000000..1691d35
--- /dev/null
+++ b/miryoku/mapping/38/kpukboard.h
@@ -0,0 +1,26 @@
+// Copyright 2023 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#if !defined (MIRYOKU_LAYOUTMAPPING_KPUKBOARD)
+
+#define XXX &none
+
+#define MIRYOKU_LAYOUTMAPPING_KPUKBOARD( \
+     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 \
+) \
+XXX  K00  K01  K02  K03  K04       K05  K06  K07  K08  K09  XXX \
+XXX  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  XXX \
+     K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
+                    K33  K34       K35  K36
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 34 35
+#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 36 37
+
+#define MIRYOKU_KLUDGE_THUMBCOMBOS
+
+#endif
+
+#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_KPUKBOARD