diff --git a/README.md b/README.md
index 12237dc3..26cad5a2 100644
--- a/README.md
+++ b/README.md
@@ -13,27 +13,8 @@ also pair/unpair supported devices with the receiver.
 the very least display some basic information about them.
 
 For some devices, extra settings (usually not available through the standard
-Linux system configuration) are supported:
-
-* The [K750 Solar Keyboard][K750] is also queried for its solar charge status.
-  Pressing the `Solar` key on the keyboard will pop-up the application window
-  and display the current lighting value (Lux) as reported by the keyboard,
-  similar to Logitech's *Solar.app* for Windows.
-
-* The state of the `FN` key can be toggled on some keyboards ([K750][K750],
-  [K800][K800] and [K360][K360]). It changes the way the function keys
-  (`F1`..`F12`) work, i.e. whether holding `FN` while pressing the function keys
-  will generate the standard `Fx` keycodes or the special function (yellow
-  icons) keycodes.
-
-* The DPI can be changed on the [Performance MX Mouse][P_MX].
-
-* Smooth scrolling (higher sensitivity on vertical scrolling with the wheel) can
-  be toggled on the [M705 Marathon Mouse][M705] and [Anywhere MX Mouse][A_MX].
-
-Extended support for other devices may be added in the future, depending on the
-documentation available, but the K750 keyboard and M705 mouse are the only
-devices I have and can directly test on right now.
+Linux system configuration) are supported. For a full list of supported devices
+and their features, see [`docs/devices.md`](docs/devices.md).
 
 
 ## Pre-built packages
@@ -130,6 +111,7 @@ who also provided some internal
 - [Lars-Dominik Braun](http://6xq.net/git/lars/lshidpp.git)
 - [Alexander Hofbauer](http://derhofbauer.at/blog/blog/2012/08/28/logitech-performance-mx)
 - [Clach04](http://bitbucket.org/clach04/logitech-unifying-receiver-tools)
+- [Peter Wu](https://lekensteyn.nl/logitech-unifying.html)
 
 Also thanks to Douglas Wagner and Julien Gascard for helping with application
 testing and supporting new devices.
diff --git a/docs/devices.md b/docs/devices.md
new file mode 100644
index 00000000..32bfc95b
--- /dev/null
+++ b/docs/devices.md
@@ -0,0 +1,77 @@
+**Solaar** will detect all devices paired with your Unifying Receiver, and at
+the very least display some basic information about them.
+
+For some devices, extra settings (usually not available through the standard
+Linux system configuration) are supported:
+
+* The [K750 Solar Keyboard][K750] is also queried for its solar charge status.
+  Pressing the `Solar` key on the keyboard will pop-up the application window
+  and display the current lighting value (Lux) as reported by the keyboard,
+  similar to Logitech's *Solar.app* for Windows.
+
+* The state of the `FN` key can be toggled on some keyboards ([K750][K750],
+  [K800][K800] and [K360][K360]). It changes the way the function keys
+  (`F1`..`F12`) work, i.e. whether holding `FN` while pressing the function keys
+  will generate the standard `Fx` keycodes or the special function (yellow
+  icons) keycodes.
+
+* The DPI can be changed on the [Performance MX Mouse][P_MX].
+
+* Smooth scrolling (higher sensitivity on vertical scrolling with the wheel) can
+  be toggled on the [M705 Marathon Mouse][M705] and [Anywhere MX Mouse][A_MX].
+
+
+# Supported devices
+
+Keyboards:
+
+| Device           | Battery | Other features                                  |
+|------------------|---------|-------------------------------------------------|
+| K230             |         |                                                 |
+| K270             |         |                                                 |
+| K350             |         |                                                 |
+| K360             |         |                                                 |
+| K400 Touch       |         |                                                 |
+| K750 Solar       | yes     | FN swap, Lux reading, solar button              |
+| K800 Illuminated | yes     | FN swap                                         |
+
+
+Mice:
+
+| Device           | Battery | DPI   | Other features                          |
+|------------------|---------|-------|-----------------------------------------|
+| M315             |         |       |                                         |
+| M325             |         |       |                                         |
+| M345             |         |       |                                         |
+| M505             |         |       |                                         |
+| M510             |         |       |                                         |
+| M515 Couch       | yes     | -     |                                         |
+| M525             |         |       |                                         |
+| M705 Marathon    | yes     | -     | smooth scrolling                        |
+| T400 Zone Touch  |         |       |                                         |
+| T620 Touch       |         |       |                                         |
+| Performance MX   | yes     | yes   |                                         |
+| Anywhere MX      | yes     | -     | smooth scrolling                        |
+| Cube             |         |       |                                         |
+
+
+Trackballs:
+
+| Device           | Battery | DPI   | Other features                          |
+|------------------|---------|-------|-----------------------------------------|
+| M570 Trackball   |         |       |                                         |
+
+
+Touchpads:
+
+| Device           | Battery | DPI   | Other features                          |
+|------------------|---------|-------|-----------------------------------------|
+| T650 Touchpad    |         |       |                                         |
+
+
+Mouse-Keyboard combos:
+
+| Device           | Battery | Other features                                  |
+|------------------|---------|-------------------------------------------------|
+| MK330            |         |                                                 |
+| MK710            |         | FN swap                                         |