Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 2279)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 2280)
@@ -118,4 +118,8 @@
                 if (wpt.attr.containsKey("name")) {
                     name_desc = wpt.getString("name");
+                    if (wpt.attr.containsKey("desc")) {
+                        name_desc+=", ";
+                        name_desc+=wpt.getString("desc");
+                    }
                 } else if (wpt.attr.containsKey("desc")) {
                     name_desc = wpt.getString("desc");