diff --git a/data/deprecated.json b/data/deprecated.json
index bfe00d53b..8ff168644 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -2103,5 +2103,13 @@
   {
     "old": {"industrial": "brickworks"},
     "replace": {"industrial": "brickyard"}
+  },
+  {
+     "old": {"cycleway": "opposite"},
+     "replace": {"oneway:bicycle": "no", "cycleway:both": "no"}
+  },
+  {
+     "old": {"cycleway:left": "opposite"},
+     "replace": {"oneway:bicycle": "no", "cycleway:left": "no"}
   }
 ]
diff --git a/data/fields/cycleway.json b/data/fields/cycleway.json
index 372e929d7..2df71d965 100644
--- a/data/fields/cycleway.json
+++ b/data/fields/cycleway.json
@@ -36,17 +36,17 @@
                 "title": "Bike Lane Shared With Bus",
                 "description": "A bike lane shared with a bus lane"
             },
-            "opposite_lane": {
-                "title": "Opposite Bike Lane",
-                "description": "A bike lane that travels in the opposite direction of traffic"
-            },
-            "opposite": {
-                "title": "Contraflow Bike Lane",
-                "description": "A bike lane that travels in both directions on a one-way street"
-            },
             "separate": {
                 "title": "Cycleway Mapped Separately",
                 "description": "Indicates that cycleway was mapped as a separate geometry"
+            },
+            "opposite_lane": {
+                "title": "(Deprecated) Opposite Bike Lane",
+                "description": "Please update with oneway, oneway:bicycle, and cycleway:left/right=lane etc."
+            },
+            "opposite": {
+                "title": "(Deprecated) Contraflow Bike Lane",
+                "description": "Please update with oneway=yes, oneway:bicycle=no, and cycleway:both=no etc."
             }
         }
     },