diff --git a/.github/workflows/test-all-promicro-shields.yml b/.github/workflows/test-all-promicro-shields.yml
index 3723db0..f633adb 100644
--- a/.github/workflows/test-all-promicro-shields.yml
+++ b/.github/workflows/test-all-promicro-shields.yml
@@ -79,6 +79,7 @@ jobs:
         "tbkmini_adapterv2_left","tbkmini_adapterv2_right",
         "tightyl_left","tightyl_right",
         "viterbi_left","viterbi_right",
+        "waterfowl_left","waterfowl_right",
         "xmk",
         "zodiark_left","zodiark_right"
       ]'
diff --git a/config/waterfowl.keymap b/config/waterfowl.keymap
new file mode 100644
index 0000000..dcf666d
--- /dev/null
+++ b/config/waterfowl.keymap
@@ -0,0 +1,6 @@
+// Copyright 2023 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/40/waterfowl.h"
+#include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/40/waterfowl.h b/miryoku/mapping/40/waterfowl.h
new file mode 100644
index 0000000..08b2730
--- /dev/null
+++ b/miryoku/mapping/40/waterfowl.h
@@ -0,0 +1,21 @@
+// Copyright 2023 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#if !defined (MIRYOKU_LAYOUTMAPPING_WATERFOWL)
+
+  #define XXX &none
+
+  #define MIRYOKU_LAYOUTMAPPING_WATERFOWL( \
+  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 \
+  XXX  K32  K33  K34  XXX       XXX  K35  K36  K37  XXX
+
+  #endif
+
+#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_WATERFOWL