diff --git a/boards/fluff_m0/board.mk b/boards/fluff_m0/board.mk
new file mode 100644
index 0000000..26d9e3d
--- /dev/null
+++ b/boards/fluff_m0/board.mk
@@ -0,0 +1,2 @@
+CHIP_FAMILY = samd21
+CHIP_VARIANT = SAMD21E18A
diff --git a/boards/fluff_m0/board_config.h b/boards/fluff_m0/board_config.h
new file mode 100644
index 0000000..99350f3
--- /dev/null
+++ b/boards/fluff_m0/board_config.h
@@ -0,0 +1,15 @@
+#ifndef BOARD_CONFIG_H
+#define BOARD_CONFIG_H
+
+#define CRYSTALLESS    1
+
+#define VENDOR_NAME "Radomir Dopieralski"
+#define PRODUCT_NAME "Fluff M0"
+#define VOLUME_LABEL "FLUFFBOOT"
+#define INDEX_URL "https://hackaday.io/project/171381"
+#define BOARD_ID "SAMD21E18A-Fluff-v0"
+
+#define USB_VID 0x239A
+#define USB_PID 0x00AF
+
+#endif