diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua
index 223954f0219..4e486030a9e 100644
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@@ -275,7 +275,7 @@ function handle_bicycle_tags(profile,way,result,data)
   data.barrier = way:get_value_by_key("barrier")
   data.oneway = way:get_value_by_key("oneway")
   data.oneway_bicycle = way:get_value_by_key("oneway:bicycle")
-  data.cycleway = way:get_value_by_key("cycleway")
+  data.cycleway = way:get_value_by_key("cycleway") and way:get_value_by_key("cycleway") or way:get_value_by_key("cycleway:both")
   data.cycleway_left = way:get_value_by_key("cycleway:left")
   data.cycleway_right = way:get_value_by_key("cycleway:right")
   data.duration = way:get_value_by_key("duration")