--- Makefile.orig	2005-12-05 18:19:27.000000000 -0500
+++ Makefile	2005-12-05 18:27:04.000000000 -0500
@@ -80,6 +80,10 @@
   CHANNEL_LIBS+=chan_h323.so
 endif
 
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/unicall.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/unicall.h),)
+  CHANNEL_LIBS+=chan_unicall.so
+endif
+
 ifneq ($(wildcard misdn/chan_misdn_lib.a),)
   CHANNEL_LIBS+=chan_misdn.so
 endif
@@ -95,11 +99,6 @@
   ZAPPRI=-lpri
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
-  CFLAGS+=-DZAPATA_R2
-  ZAPR2=-lmfcr2
-endif
-
 ALSA_SRC=chan_alsa.c
 
 ifneq ($(wildcard alsa-monitor.h),)
@@ -186,6 +185,12 @@
 
 chan_alsa.o: chan_alsa.c busy.h ringtone.h
 
+chan_unicall.o: chan_unicall.c
+       $(CC) -c $(CFLAGS) -o chan_unicall.o chan_unicall.c
+
+chan_unicall.so: chan_unicall.o
+       $(CC) $(SOLINK) -o $@ $< -lunicall -lxml2 -lsupertone -lspandsp -ltiff $(ZAPLIB)
+
 ifeq (${OSARCH},OpenBSD)
 chan_oss.so: chan_oss.o
 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
@@ -202,7 +207,7 @@
 	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
 
 chan_zap.so: chan_zap.o
-	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -ltonezone
+	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) -ltonezone
 
 chan_sip.so: chan_sip.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_sip.o ${CYGSOLIB}