diff --git a/docker/Dockerfile b/docker/Dockerfile
index 89308350..5a6bc678 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -83,10 +83,15 @@ RUN apk -U add \
         ffmpeg \
         libsodium \
         libgcrypt \
-        libplist
+        libplist \
+        mandoc \
+        man-pages \
+        less \
+        less-doc
 
 # Copy build files.
 COPY --from=builder /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync
+COPY --from=builder /shairport-sync/build/install/usr/local/share/man/man7 /usr/share/man/man7
 COPY --from=builder /usr/local/bin/nqptp /usr/local/bin/nqptp
 COPY --from=builder /usr/local/lib/libalac.* /usr/local/lib/
 COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf /etc/
diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile
index 65ba957d..03baac5e 100644
--- a/docker/classic/Dockerfile
+++ b/docker/classic/Dockerfile
@@ -62,11 +62,15 @@ RUN apk -U add \
         avahi-tools \
         libconfig \
         mosquitto \
-        libsndfile-dev
-
+        libsndfile-dev \
+        mandoc \
+        man-pages \
+        less \
+        less-doc
 
 # Copy build files.
 COPY --from=builder /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync
+COPY --from=builder /shairport-sync/build/install/usr/local/share/man/man7 /usr/share/man/man7
 COPY --from=builder /usr/local/lib/libalac.* /usr/local/lib/
 COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf /etc/
 COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf.sample /etc/
diff --git a/mqtt.c b/mqtt.c
index cf2e2388..f662009d 100644
--- a/mqtt.c
+++ b/mqtt.c
@@ -197,6 +197,12 @@ void mqtt_process_metadata(uint32_t type, uint32_t code, char *data, uint32_t le
       case 'daid':
         mqtt_publish("dacp_id", data, length);
         break;
+      case 'phbt':
+        mqtt_publish("frame_position_and_time", data, length);
+        break;
+      case 'phb0':
+        mqtt_publish("first_frame_position_and_time", data, length);
+        break;
       case 'ofmt':
         mqtt_publish("output_format", data, length);
         break;
diff --git a/player.c b/player.c
index 9206e5da..61b4e5ff 100644
--- a/player.c
+++ b/player.c
@@ -1838,7 +1838,7 @@ void player_thread_cleanup_handler(void *arg) {
 void *player_thread_func(void *arg) {
   rtsp_conn_info *conn = (rtsp_conn_info *)arg;
 #ifdef CONFIG_METADATA
-  uint64_t time_of_last_metadata_progress_update;
+  uint64_t time_of_last_metadata_progress_update = 0; // the assignment is to stop a compiler warning...
 #endif
   uint64_t previous_frames_played = 0; // initialised to avoid a "possibly uninitialised" warning
   uint64_t previous_raw_measurement_time =