diff --git a/htdocs/map.js b/htdocs/map.js
index 76a40913..c8ae91b7 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -453,6 +453,15 @@ $(function(){
         var title;
         if (marker.icao) {
             title = marker.identification || marker.icao;
+            if (marker.altitude) {
+                commentString += '<div>Altitude: ' + marker.altitude + ' ft</div>';
+            }
+            if (marker.groundspeed) {
+                commentString += '<div>Speed: ' + Math.round(marker.groundspeed) + ' kt</div>';
+            }
+            if (marker.verticalspeed) {
+                commentString += '<div>V/S: ' + marker.verticalspeed + ' ft/min</div>';
+            }
         } else {
             linkifySource(source);
         }
diff --git a/owrx/adsb/modes.py b/owrx/adsb/modes.py
index 2d580c30..ca51fb45 100644
--- a/owrx/adsb/modes.py
+++ b/owrx/adsb/modes.py
@@ -18,7 +18,17 @@ d_lat_odd = 360 / (4 * nz - 1)
 
 
 class AirplaneLocation(LatLngLocation, IncrementalUpdate, ABC):
-    mapKeys = ['icao', 'lat', 'lon', 'altitude', 'heading', 'groundtrack', 'identification']
+    mapKeys = [
+        "icao",
+        "lat",
+        "lon",
+        "altitude",
+        "heading",
+        "groundtrack",
+        "groundspeed",
+        "verticalspeed",
+        "identification",
+    ]
     ttl = 30
 
     def __init__(self, message):