diff --git a/modules/svg/labels.js b/modules/svg/labels.js
index c6fdaf9cbe..1e9fd74c29 100644
--- a/modules/svg/labels.js
+++ b/modules/svg/labels.js
@@ -61,7 +61,9 @@ export function svgLabels(projection, context) {
         ['point', 'camp_site', '*', 10],
         ['line', 'name', '*', 12],
         ['area', 'name', '*', 12],
-        ['point', 'name', '*', 10]
+        ['point', 'name', '*', 10],
+        ['area', 'addr:housenumber', '*', 12],
+        ['point', 'addr:housenumber', '*', 10]
     ];
 
 
diff --git a/modules/util/util.js b/modules/util/util.js
index 6ab48cbbf9..2618c025e4 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -97,15 +97,22 @@ export function utilGetAllNodes(ids, graph) {
 export function utilDisplayName(entity) {
     var localizedNameKey = 'name:' + utilDetect().locale.toLowerCase().split('-')[0];
     var name = entity.tags[localizedNameKey] || entity.tags.name || '';
-    var network = entity.tags.cycle_network || entity.tags.network;
 
     if (!name && entity.tags.ref) {
         name = entity.tags.ref;
+        var network = entity.tags.cycle_network || entity.tags.network;
         if (network) {
             name = network + ' ' + name;
         }
     }
 
+    if (!name && entity.tags['addr:housenumber']) {
+        name = entity.tags['addr:housenumber'];
+        if (entity.tags['addr:street']) {
+            name += ' ' + entity.tags['addr:street'];
+        }
+    }
+
     return name;
 }