Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15919)
+++ trunk/data/defaultpresets.xml	(revision 15930)
@@ -2787,4 +2787,9 @@
             <link wiki="Tag:aeroway=navigationaid" />
             <key key="aeroway" value="navigationaid" />
+            <combo key="navigationaid" text="Type" values_searchable="true">
+                <list_entry value="als" icon="presets/transport/airport/navigationaid.svg" short_description="Approach lighting system" />
+                <list_entry value="papi" icon="presets/transport/airport/papi.svg" short_description="Precision approach path indicator" />
+                <list_entry value="vasi" icon="presets/transport/airport/vasi.svg" short_description="Visual approach slope indicator" />
+            </combo>
         </item> <!-- Navigation aid -->
         <item name="Windsock" icon="presets/transport/airport/windsock.svg" type="node" preset_name_label="true">
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15919)
+++ trunk/data/validator/deprecated.mapcss	(revision 15930)
@@ -1936,2 +1936,11 @@
   fixChangeKey: "car => motorcar";
 }
+
+/* #18767 */
+*[navigationaid=approach_light],
+*[navigationaid="ALS (Approach lighting system)"] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "navigationaid=als";
+  group: tr("deprecated tagging");
+  fixAdd: "navigationaid=als";
+}