diff --git a/common.h b/common.h
index 40ccdae..db458bd 100644
--- a/common.h
+++ b/common.h
@@ -237,6 +237,7 @@ typedef struct
     int priority;
 
     int64_t cpb_initial_arrival_time;
+    int64_t cpb_final_arrival_time;
     int64_t dts;
     int64_t pts;
 
diff --git a/libmpegts.c b/libmpegts.c
index 666e909..1ec833d 100644
--- a/libmpegts.c
+++ b/libmpegts.c
@@ -1539,6 +1539,7 @@ int ts_write_frames( ts_writer_t *w, ts_frame_t *frames, int num_frames, uint8_t
         new_pes[i]->random_access = !!frames[i].random_access;
         new_pes[i]->priority = !!frames[i].priority;
         new_pes[i]->cpb_initial_arrival_time = frames[i].cpb_initial_arrival_time + TS_START * 27000000LL;
+        new_pes[i]->cpb_final_arrival_time = frames[i].cpb_final_arrival_time + TS_START * 27000000LL;
         new_pes[i]->dts = frames[i].dts + TS_START * 90000LL;
         new_pes[i]->pts = frames[i].pts + TS_START * 90000LL;
         new_pes[i]->frame_type = frames[i].frame_type;
@@ -1591,23 +1592,16 @@ int ts_write_frames( ts_writer_t *w, ts_frame_t *frames, int num_frames, uint8_t
     }
 
     /* loop through and find the time when the second video packet in the queue can arrive */
-    int video_found = 0;
     int64_t pcr_stop = 0;
 
     cur_pcr = get_pcr( w, 0 );
 
     for( int i = 0; i < w->num_buffered_frames; i++ )
     {
-        stream = queued_pes[i]->stream;
-        if( IS_VIDEO( stream ) )
+        if( IS_VIDEO( queued_pes[i]->stream ) )
         {
-            /* last frame is a special case - FIXME: is this acceptable in all use-cases? */
-            if( !num_frames )
-                pcr_stop = queued_pes[i]->dts;
-            else if( !video_found )
-                video_found = 1;
-            else
-                pcr_stop = queued_pes[i]->cpb_initial_arrival_time; /* earliest that a frame can arrive */
+            pcr_stop = queued_pes[i]->cpb_final_arrival_time;
+            break;
         }
     }
 
@@ -1680,7 +1674,6 @@ int ts_write_frames( ts_writer_t *w, ts_frame_t *frames, int num_frames, uint8_t
         if( pes )
         {
             stream = pes->stream;
-
             pes_start = pes->data == pes->cur_pos; /* flag if packet contains pes header */
 #if 0
             if( IS_VIDEO( stream ) && pes_start )
diff --git a/libmpegts.h b/libmpegts.h
index 7cce017..df59a8e 100644
--- a/libmpegts.h
+++ b/libmpegts.h
@@ -610,6 +610,7 @@ int ts_setup_dtcp( ts_writer_t *w, uint8_t byte_1, uint8_t byte_2 );
  * ** Video Only **
  *
  * CPB Initial Arrival Time - initial arrival time of picture in CPB (in 27MHz clock ticks)
+ * CPB Final Arrival Time - final arrival time of picture in CPB (in 27MHz clock ticks)
  * DTS - Decode Time Stamp (in 90kHz clock ticks - maximum 30 bits)
  * PTS - Presentation Time Stamp (in 90kHz clock ticks - maximum 30 bits)
  * (PTS and DTS may have codec-specific meanings. See ISO 13818-1 for more information)
@@ -635,6 +636,7 @@ typedef struct
     int size;
     int pid;
     int64_t cpb_initial_arrival_time;
+    int64_t cpb_final_arrival_time;
     int64_t dts;
     int64_t pts;
     int random_access;