diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 8d8bc4b..584727d 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -2801,9 +2801,32 @@ static int dahdi_specchan_release(struct file *file)
 	if (chan) {
 		/* Chan lock protects contents against potentially non atomic accesses.
 		 * So if the pointer setting is not atomic, we should protect */
+		if (chan->srcmirror) {
+			struct dahdi_chan *const srcmirror = chan->srcmirror;
+			spin_lock_irqsave(&srcmirror->lock, flags);
+			if (chan == srcmirror->txmirror) {
+				module_printk(KERN_INFO, "Chan %d tx mirror " \
+					      "to %d stopped\n",
+					      srcmirror->txmirror->channo,
+					      srcmirror->channo);
+				srcmirror->txmirror = NULL;
+			}
+
+			if (chan == srcmirror->rxmirror) {
+				module_printk(KERN_INFO, "Chan %d rx mirror " \
+					      "to %d stopped\n",
+					      srcmirror->rxmirror->channo,
+					      srcmirror->channo);
+				chan->srcmirror->rxmirror = NULL;
+			}
+			spin_unlock_irqrestore(&chan->srcmirror->lock, flags);
+		}
+
 		spin_lock_irqsave(&chan->lock, flags);
 		chan->file = NULL;
 		file->private_data = NULL;
+		chan->srcmirror = NULL;
+
 		spin_unlock_irqrestore(&chan->lock, flags);
 		close_channel(chan);
 		clear_bit(DAHDI_FLAGBIT_OPEN, &chan->flags);
@@ -5019,6 +5042,93 @@ static int dahdi_ioctl_iomux(struct file *file, unsigned long data)
 	return ret;
 }
 
+static int dahdi_ioctl_rxmirror(struct file *file, unsigned long data)
+{
+	int res;
+	int i;
+	unsigned long flags;
+	struct dahdi_chan *const chan = chan_from_file(file);
+	struct dahdi_chan *srcmirror;
+
+	if (!chan || chan->srcmirror)
+		return -ENODEV;
+
+	res = get_user(i, (int __user *)data);
+	if (res)
+		return res;
+
+	srcmirror = chan_from_num(i);
+	if (!srcmirror)
+		return -EINVAL;
+
+	module_printk(KERN_INFO, "Chan %d rx mirrored to %d\n",
+		      srcmirror->channo, chan->channo);
+
+	spin_lock_irqsave(&srcmirror->lock, flags);
+	if (srcmirror->rxmirror == NULL)
+		srcmirror->rxmirror = chan;
+
+	spin_unlock_irqrestore(&srcmirror->lock, flags);
+	if (srcmirror->rxmirror != chan) {
+		module_printk(KERN_INFO, "Chan %d cannot be rxmirrored, " \
+			      "already in use\n", srcmirror->channo);
+		return -EFAULT;
+	}
+
+	spin_lock_irqsave(&chan->lock, flags);
+	chan->srcmirror = srcmirror;
+	chan->flags = srcmirror->flags;
+	chan->sig =  srcmirror->sig;
+	clear_bit(DAHDI_FLAGBIT_OPEN, &chan->flags);
+	spin_unlock_irqrestore(&chan->lock, flags);
+
+	return 0;
+}
+
+static int dahdi_ioctl_txmirror(struct file *file, unsigned long data)
+{
+	int res;
+	int i;
+	unsigned long flags;
+	struct dahdi_chan *const chan = chan_from_file(file);
+	struct dahdi_chan *srcmirror;
+
+	if (!chan || chan->srcmirror)
+		return -ENODEV;
+
+	res = get_user(i, (int __user *)data);
+	if (res)
+		return res;
+
+	srcmirror = chan_from_num(i);
+	if (!srcmirror)
+		return -EINVAL;
+
+	module_printk(KERN_INFO, "Chan %d tx mirrored to %d\n",
+		      srcmirror->channo, chan->channo);
+
+	spin_lock_irqsave(&srcmirror->lock, flags);
+	srcmirror->txmirror = chan;
+	if (srcmirror->txmirror == NULL)
+		srcmirror->txmirror = chan;
+	spin_unlock_irqrestore(&srcmirror->lock, flags);
+
+	if (srcmirror->txmirror != chan) {
+		module_printk(KERN_INFO, "Chan %d cannot be txmirrored, " \
+			      "already in use\n", i);
+		return -EFAULT;
+	}
+
+	spin_lock_irqsave(&chan->lock, flags);
+	chan->srcmirror = srcmirror;
+	chan->flags = srcmirror->flags;
+	chan->sig =  srcmirror->sig;
+	clear_bit(DAHDI_FLAGBIT_OPEN, &chan->flags);
+	spin_unlock_irqrestore(&chan->lock, flags);
+
+	return 0;
+}
+
 static int
 dahdi_chanandpseudo_ioctl(struct file *file, unsigned int cmd,
 			  unsigned long data)
@@ -5035,6 +5145,12 @@ dahdi_chanandpseudo_ioctl(struct file *file, unsigned int cmd,
 	if (!chan)
 		return -EINVAL;
 	switch(cmd) {
+	case DAHDI_RXMIRROR:
+		return dahdi_ioctl_rxmirror(file, data);
+
+	case DAHDI_TXMIRROR:
+		return dahdi_ioctl_txmirror(file, data);
+
 	case DAHDI_DIALING:
 		spin_lock_irqsave(&chan->lock, flags);
 		j = chan->dialing;
@@ -6545,8 +6661,15 @@ static inline void __dahdi_process_getaudio_chunk(struct dahdi_chan *ss, unsigne
 		txb[x] = ms->txgain[txb[x]];
 }
 
+static void __putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb,
+			   int bytes);
+
 static inline void __dahdi_getbuf_chunk(struct dahdi_chan *ss, unsigned char *txb)
 {
+
+
+	unsigned char *orig_txb = txb;
+
 	/* Called with ss->lock held */
 	/* We transmit data from our master channel */
 	struct dahdi_chan *ms = ss->master;
@@ -6708,6 +6831,12 @@ out in the later versions, and is put back now. */
 			bytes = 0;
 		}
 	}
+
+	if (ss->txmirror) {
+		spin_lock(&ss->txmirror->lock);
+		__putbuf_chunk(ss->txmirror, orig_txb, DAHDI_CHUNKSIZE);
+		spin_unlock(&ss->txmirror->lock);
+	}
 }
 
 static inline void rbs_itimer_expire(struct dahdi_chan *chan)
@@ -7590,7 +7719,7 @@ static inline void __dahdi_process_putaudio_chunk(struct dahdi_chan *ss, unsigne
 }
 
 /* HDLC (or other) receiver buffer functions for read side */
-static inline void __putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb, int bytes)
+static void __putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb, int bytes)
 {
 	/* We transmit data from our master channel */
 	/* Called with ss->lock held */
@@ -7607,7 +7736,6 @@ static inline void __putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb, int
 	int res;
 	int left, x;
 
-
 	while(bytes) {
 #if defined(CONFIG_DAHDI_NET)  || defined(CONFIG_DAHDI_PPP)
 		skb = NULL;
@@ -7877,11 +8005,18 @@ that the waitqueue is empty. */
 		}
 #endif
 	}
+
 }
 
 static inline void __dahdi_putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb)
 {
 	__putbuf_chunk(ss, rxb, DAHDI_CHUNKSIZE);
+
+	if (ss->rxmirror) {
+		spin_lock(&ss->rxmirror->lock);
+		__putbuf_chunk(ss->rxmirror, rxb, DAHDI_CHUNKSIZE);
+		spin_unlock(&ss->rxmirror->lock);
+	}
 }
 
 static void __dahdi_hdlc_abort(struct dahdi_chan *ss, int event)
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 9a21c63..e1c8927 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -444,6 +444,9 @@ struct dahdi_chan {
 	struct file *file;	/*!< File structure */
 	
 	
+	struct dahdi_chan	*rxmirror;  /*!< channel we mirror reads to */
+	struct dahdi_chan	*txmirror;  /*!< channel we mirror writes to */
+	struct dahdi_chan	*srcmirror; /*!< channel we mirror from */
 	struct dahdi_span	*span;			/*!< Span we're a member of */
 	int		sig;			/*!< Signalling */
 	int		sigcap;			/*!< Capability for signalling */
diff --git a/include/dahdi/user.h b/include/dahdi/user.h
index 0f71355..fe4be66 100644
--- a/include/dahdi/user.h
+++ b/include/dahdi/user.h
@@ -1076,6 +1076,12 @@ struct dahdi_vmwi_info {
 
 #define DAHDI_ECHOCANCEL_FAX_MODE	_IOW(DAHDI_CODE, 102, int)
 
+/*
+ * Defines which channel to receive mirrored traffic from
+ */
+#define DAHDI_RXMIRROR			_IOW(DAHDI_CODE, 103, int)
+#define DAHDI_TXMIRROR			_IOW(DAHDI_CODE, 104, int)
+
 /* Get current status IOCTL */
 /* Defines for Radio Status (dahdi_radio_stat.radstat) bits */