diff --git a/lib/devices.js b/lib/devices.js
index 553d3338..2b75f199 100644
--- a/lib/devices.js
+++ b/lib/devices.js
@@ -171,7 +171,7 @@ const devices = {
     'ZB-SmartPlug-1.0.0': {
         model: 'PLUG EDP RE:DY',
         vendor: 'EDP',
-        description: 'Plug EDP re:dy',
+        description: 're:dy plug',
         supports: 'on/off, power measurement',
         report: [{
             'cid': 'seMetering',
@@ -187,7 +187,7 @@ const devices = {
     'lumi.router': {
         model: 'CC2530.ROUTER',
         vendor: 'Texas Instruments',
-        description: 'CC2530 router [link](http://ptvo.info/cc2530-based-zigbee-coordinator-and-router-112/)',
+        description: '[CC2530 router](http://ptvo.info/cc2530-based-zigbee-coordinator-and-router-112/)',
         supports: 'state, description, type, rssi',
     },
 };
diff --git a/support/docgen.js b/support/docgen.js
index 53038fbe..8dadec0f 100644
--- a/support/docgen.js
+++ b/support/docgen.js
@@ -38,7 +38,8 @@ const logDevices = (devices) => {
     result += '| ------------- | ------------- | -------------------------- |\n';
     devices = new Map(devices.map((d) => [d.model, d]));
     devices.forEach((device) => {
-        result += `| ${device.model} | ${device.vendor} ${device.description} (${device.supports}) | ![${device.model}](images/devices/${device.model.replace('/', '-')}.jpg) |\n`;
+        const pathFriendly = device.model.replace('/', '-').replace(':', '-');
+        result += `| ${device.model} | ${device.vendor} ${device.description} (${device.supports}) | ![${pathFriendly}](images/devices/${pathFriendly}.jpg) |\n`;
     });
 
     return result;