diff --git a/ffmuxer.c b/ffmuxer.c
index 32e8dc88..cf07824b 100644
--- a/ffmuxer.c
+++ b/ffmuxer.c
@@ -42,6 +42,20 @@
 #include "ffmuxer.h"
 #include "buffer.h"
 
+static URLProtocol tffm_fifo_proto;
+
+
+/**
+ * Register a callback
+ */
+void
+tffm_init(void)
+{
+  register_protocol(&tffm_fifo_proto);
+}
+
+
+
 /**
  *  Internal state
  */
@@ -143,7 +157,13 @@ tffm_open(th_ffmuxer_t *tffm, th_transport_t *t,
       continue;
     }
 
-    ctx = avcodec_alloc_context();
+    tms = calloc(1, sizeof(th_muxstream_t));
+    tms->tms_stream   = st;
+    tms->tms_index = fctx->nb_streams;
+
+    tms->tms_avstream = av_new_stream(fctx, fctx->nb_streams);
+
+    ctx = tms->tms_avstream->codec;
     ctx->codec_id   = codec_id;
     ctx->codec_type = codec_type;
 
@@ -155,18 +175,8 @@ tffm_open(th_ffmuxer_t *tffm, th_transport_t *t,
       continue;
     }
 
-    tms = calloc(1, sizeof(th_muxstream_t));
-    tms->tms_stream   = st;
     LIST_INSERT_HEAD(&tm->tm_streams, tms, tms_muxer_link0);
-
-
-    tms->tms_avstream = av_mallocz(sizeof(AVStream));
-    tms->tms_avstream->codec = ctx;
-
     memcpy(tms->tms_avstream->language, tms->tms_stream->st_lang, 4);
-    tms->tms_index = fctx->nb_streams;
-    fctx->streams[fctx->nb_streams] = tms->tms_avstream;
-    fctx->nb_streams++;
   }
 
   /* Fire up recorder thread */
@@ -316,11 +326,16 @@ tffm_record_packet(th_ffmuxer_t *tffm, th_pkt_t *pkt)
     tffm_set_state(tffm, TFFM_RUNNING);
 
     if(!tffm->tffm_header_written) {
+
+      if(av_write_header(fctx)) {
+	syslog(LOG_ERR, 
+	       "%s - Unable to write header", 
+	       tffm->tffm_printname);
+ 	break;
+      }
+
       tffm->tffm_header_written = 1;
 
-      if(av_write_header(fctx))
-	break;
-      
       syslog(LOG_DEBUG, 
 	     "%s - Header written to file, stream dump:", 
 	     tffm->tffm_printname);
@@ -340,6 +355,9 @@ tffm_record_packet(th_ffmuxer_t *tffm, th_pkt_t *pkt)
       
   case TFFM_RUNNING:
      
+    if(tffm->tffm_header_written == 0)
+      break;
+
     if(pkt->pkt_commercial == COMMERCIAL_YES) {
       tffm_set_state(tffm, TFFM_COMMERCIAL);
       break;
@@ -370,3 +388,124 @@ tffm_record_packet(th_ffmuxer_t *tffm, th_pkt_t *pkt)
     break;
   }
 }
+
+/**
+ * Packet input
+ */
+void
+tffm_packet_input(th_muxer_t *tm, th_stream_t *st, th_pkt_t *pkt)
+{
+  th_ffmuxer_t *tffm = tm->tm_opaque;
+
+  tffm_record_packet(tffm, pkt);
+}
+
+
+
+/**
+ *
+ */
+static int fifo_tally;
+static LIST_HEAD(, tffm_fifo) tffm_fifos;
+
+tffm_fifo_t *
+tffm_fifo_create(tffm_fifo_callback_t *callback, void *opaque)
+{
+  tffm_fifo_t *tf = calloc(1, sizeof(tffm_fifo_t));
+  char buf[100];
+
+  tf->tf_callback = callback;
+  tf->tf_opaque = opaque;
+
+  tf->tf_id = ++fifo_tally;
+  TAILQ_INIT(&tf->tf_pktq);
+  LIST_INSERT_HEAD(&tffm_fifos, tf, tf_link);
+
+  snprintf(buf, sizeof(buf), "tvheadendfifo:%d", tf->tf_id);
+  tf->tf_filename = strdup(buf);
+  return tf;
+}
+
+
+/**
+ * Destroy a fifo
+ */
+void
+tffm_fifo_destroy(tffm_fifo_t *tf)
+{
+  tffm_fifo_pkt_t *pkt;
+
+  while((pkt = TAILQ_FIRST(&tf->tf_pktq)) != NULL) {
+    TAILQ_REMOVE(&tf->tf_pktq, pkt, tfp_link);
+    free(pkt);
+  }
+
+  LIST_REMOVE(tf, tf_link);
+  free(tf->tf_filename);
+  free(tf);
+}
+
+
+/**
+ * libavformat URLProtocol open func for internal fifo
+ */
+static int
+tffm_fifo_open(URLContext *h, const char *filename, int flags)
+{
+  uint32_t id;
+  char *final;
+  tffm_fifo_t *tf;
+
+  av_strstart(filename, "tvheadendfifo:", &filename);  
+  id = strtol(filename, &final, 10);
+  if(filename == final || *final)
+    return AVERROR(ENOENT);
+
+  LIST_FOREACH(tf, &tffm_fifos, tf_link)
+    if(tf->tf_id == id)
+      break;
+  
+  if(tf == NULL)
+    return AVERROR(ENOENT);
+
+  h->priv_data = tf;
+  h->is_streamed = 1;
+  return 0;
+}
+
+/**
+ * libavformat URLProtocol write function, copy to an internal buffer
+ */
+static int
+tffm_fifo_write(URLContext *h, unsigned char *buf, int size)
+{
+  tffm_fifo_pkt_t *pkt;
+  tffm_fifo_t *tf = h->priv_data;
+
+  pkt = malloc(size + sizeof(tffm_fifo_pkt_t));
+  memcpy(pkt->tfp_buf, buf, size);
+  pkt->tfp_pktsize = size;
+  tf->tf_pktq_len += size;
+  TAILQ_INSERT_TAIL(&tf->tf_pktq, pkt, tfp_link);
+
+  tf->tf_callback(tf->tf_opaque);
+  return size;
+}
+
+
+static int
+tffm_fifo_close(URLContext *h)
+{
+  h->priv_data = NULL;
+  return 0;
+}
+
+
+static URLProtocol tffm_fifo_proto = {
+    "tvheadendfifo",
+    tffm_fifo_open,
+    NULL, /* read */
+    tffm_fifo_write,
+    NULL, /* seek */
+    tffm_fifo_close,
+};
diff --git a/ffmuxer.h b/ffmuxer.h
index 24fe2d3e..6cfe6436 100644
--- a/ffmuxer.h
+++ b/ffmuxer.h
@@ -19,10 +19,44 @@
 #ifndef FFMUXER_H
 #define FFMUXER_H
 
+TAILQ_HEAD(tffm_fifo_pkt_queue, tffm_fifo_pkt);
+
+
+typedef struct tffm_fifo_pkt {
+  TAILQ_ENTRY(tffm_fifo_pkt) tfp_link;
+
+  size_t tfp_pktsize;
+  uint8_t tfp_buf[0];
+} tffm_fifo_pkt_t;
+
+typedef void (tffm_fifo_callback_t)(void *opaque);
+
+typedef struct tffm_fifo {
+  LIST_ENTRY(tffm_fifo) tf_link;
+
+  uint32_t tf_id;
+  char *tf_filename;
+  
+  size_t tf_pktq_len;
+  struct tffm_fifo_pkt_queue tf_pktq;
+
+  tffm_fifo_callback_t *tf_callback;
+  void *tf_opaque;
+
+} tffm_fifo_t;
+
+void tffm_init(void);
+
 void tffm_set_state(th_ffmuxer_t *tffm, int status);
 void tffm_record_packet(th_ffmuxer_t *tffm, th_pkt_t *pkt);
 void tffm_open(th_ffmuxer_t *tffm, th_transport_t *t,
 	       AVFormatContext *fctx, const char *printname);
 void tffm_close(th_ffmuxer_t *tffm);
+void tffm_packet_input(th_muxer_t *tm, th_stream_t *st, th_pkt_t *pkt);
+
+tffm_fifo_t *tffm_fifo_create(tffm_fifo_callback_t *callback, void *opaque);
+void tffm_fifo_destroy(tffm_fifo_t *tf);
+
+#define tffm_filename(tffm) ((tffm)->tf_filename)
 
 #endif /* FFMUXER_H */
diff --git a/main.c b/main.c
index 4e91a428..cabfc591 100644
--- a/main.c
+++ b/main.c
@@ -57,6 +57,7 @@
 #include "cwc.h"
 #include "autorec.h"
 #include "spawn.h"
+#include "ffmuxer.h"
 
 #include <libhts/htsparachute.h>
 
@@ -211,7 +212,7 @@ main(int argc, char **argv)
 
   av_register_all();
   av_log_set_level(AV_LOG_INFO);
-
+  tffm_init();
   pkt_init();
 
   if(!disable_dvb)