diff --git a/debian/changelog b/debian/changelog
index d74cfbd..77b2b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dump1090-fa (3.6.1~dev) UNRELEASED; urgency=medium
+
+  * in development
+  * fix tracking of NICbaro
+
+ -- Oliver Jowett <oliver@mutability.co.uk>  Tue, 12 Jun 2018 01:12:00 +0100
+
 dump1090-fa (3.6.0) stable; urgency=medium
 
   * dump1090: implement speculative decoding for Comm-B messages, capturing
diff --git a/track.c b/track.c
index 83d37df..f16109b 100644
--- a/track.c
+++ b/track.c
@@ -1031,6 +1031,10 @@ struct aircraft *trackUpdateFromMessage(struct modesMessage *mm)
         a->nic_c = mm->accuracy.nic_c;
     }
 
+    if (mm->accuracy.nic_baro_valid && accept_data(&a->nic_baro_valid, mm->source)) {
+        a->nic_baro = mm->accuracy.nic_baro;
+    }
+
     if (mm->accuracy.nac_p_valid && accept_data(&a->nac_p_valid, mm->source)) {
         a->nac_p = mm->accuracy.nac_p;
     }