diff --git a/data/wacom-one-pen-m.tablet b/data/wacom-one-pen-m.tablet
new file mode 100644
index 000000000..052b57991
--- /dev/null
+++ b/data/wacom-one-pen-m.tablet
@@ -0,0 +1,29 @@
+# Wacom
+# Wacom One Pen tablet medium
+# CTC6110WL
+#
+# Third-generation "One by Wacom"
+#
+# Stylus with two buttons and no physical eraser. Upper button switches the
+# pen to become an eraser, similar to AES devices.
+#
+# Pen active area: 8.50 x 5.31in
+#
+# Has an "Android mode" with a slightly different HID descriptor which
+# uses the alternate VID:PID of 0531:0105.
+
+[Device]
+Name=Wacom One Pen tablet medium
+ModelName=CTC6110WL
+DeviceMatch=usb:0531:0102;bluetooth:0531:0103;usb:0531:0105
+Class=Bamboo
+Width=9
+Height=5
+# No pad buttons, so no layout
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Buttons=0
diff --git a/data/wacom-one-pen-s.tablet b/data/wacom-one-pen-s.tablet
new file mode 100644
index 000000000..62d36eccd
--- /dev/null
+++ b/data/wacom-one-pen-s.tablet
@@ -0,0 +1,29 @@
+# Wacom
+# Wacom One Pen tablet small
+# CTC4110WL
+#
+# Third-generation "One by Wacom"
+#
+# Stylus with two buttons and no physical eraser. Upper button switches the
+# pen to become an eraser, similar to AES devices.
+#
+# Pen active area: 5.98 x 3.74in
+#
+# Has an "Android mode" with a slightly different HID descriptor which
+# uses the alternate VID:PID of 0531:0104.
+
+[Device]
+Name=Wacom One Pen tablet small
+ModelName=CTC4110WL
+DeviceMatch=usb:0531:0100;bluetooth:0531:0101;usb:0531:0104
+Class=Bamboo
+Width=6
+Height=4
+# No pad buttons, so no layout
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Buttons=0