diff --git a/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
index 46e9f67..28678c0 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
@@ -167,7 +167,8 @@ public abstract class LabelCompositionStrategy {
          * @since 6541
          */
         static public final String[] DEFAULT_NAME_COMPLEMENT_TAGS = {
-            "capacity"
+                "capacity",
+                "addr:housenumber",
         };
 
         private List<String> nameTags = new ArrayList<String>();
@@ -263,16 +264,18 @@ public abstract class LabelCompositionStrategy {
 
         private String getPrimitiveName(OsmPrimitive n) {
             String name = null;
+            String usedNameTag = null;
             if (!n.hasKeys()) return null;
             for (String rn : nameTags) {
                 name = n.get(rn);
                 if (name != null) {
+                    usedNameTag = rn;
                     break;
                 }
             }
             for (String rn : nameComplementTags) {
                 String comp = n.get(rn);
-                if (comp != null) {
+                if (comp != null && !rn.equals(usedNameTag)) {
                     if (name == null) {
                         name = comp;
                     } else {