Index: /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 21866)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 21867)
@@ -576,4 +576,5 @@
       /*JComboBox*/ comboBox = new JComboBox();
       comboBox.addItem("bus");
+      comboBox.addItem("trolleybus");
       comboBox.addItem("tram");
       comboBox.addItem("light_rail");
@@ -1773,4 +1774,9 @@
 	  stopValue = "bus_stop";
 	}
+	else if ("trolleybus".equals(currentRoute.get("route")))
+	{
+	  stopKey = "highway";
+	  stopValue = "bus_stop";
+	}
 	else if ("tram".equals(currentRoute.get("route")))
 	{
@@ -1863,4 +1869,6 @@
 	  String routeVal = currentRel.get("route");
 	  if ("bus".equals(routeVal))
+	    relRefs.add(new RouteReference(currentRel));
+	  else if ("trolleybus".equals(routeVal))
 	    relRefs.add(new RouteReference(currentRel));
 	  else if ("tram".equals(routeVal))