diff --git a/src/mod/endpoints/mod_wanpipe/Makefile b/src/mod/endpoints/mod_wanpipe/Makefile
index 74f9d8977f..e46772979d 100644
--- a/src/mod/endpoints/mod_wanpipe/Makefile
+++ b/src/mod/endpoints/mod_wanpipe/Makefile
@@ -9,34 +9,36 @@ WANPIPE_FILE=$(WANPIPE).tgz
 WANPIPE_DIR=$(BASE)/libs/$(WANPIPE)
 WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include
 WANPIPE_KO=$(WANPIPE_DIR)/patches/kdrivers/src/net/wanpipe.ko
+WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko")
 LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma
-LIBSANGOMA_LA=$(LIBSANGOMA_DIR)/.libs/libsangoma.la
-LIBSANGOMA_MAKEFILE=$(LIBSANGOMA_DIR)/Makefile
-LOCAL_CFLAGS  =-I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include 
-LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src
-LOCAL_CFLAGS +=-w
-LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA)
-OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared
-LOCAL_OBJS +=$(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o
-include $(BASE)/build/modmake.rules
+TELETONE_DIR=$(BASE)/libs/libteletone
+TELETONE_LA=$(TELETONE_DIR)/libteletone.la
+LOCAL_CFLAGS  =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include 
+LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API
+LOCAL_LIBADD = $(TELETONE_LA)
+LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o 
+
+
+include $(BASE)/build/modmake.rules 
 
 $(LIBPRI_DIR):
 	$(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE)
-	cd $(LIBPRI_DIR)
-
-$(LIBSANGOMA_MAKEFILE): $(LIBPRI_DIR)
-	cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS)
-
-$(LIBSANGOMA_LA): $(LIBSANGOMA_MAKEFILE)
-	cd $(LIBSANGOMA_DIR) && $(MAKE)
 
 $(WANPIPE_DIR):
 	$(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE)
 
 $(WANPIPE_KO): $(WANPIPE_DIR)
-	cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install
-	rm -f $(LIBSANGOMA_MAKEFILE)
+	cd $(WANPIPE_DIR) && $(MAKE)
+	@$(TOUCH_TARGET)
 
-local_depend: $(WANPIPE_KO)
+$(TELETONE_LA):
+	cd $(TELETONE_DIR) && $(MAKE)
+	@$(TOUCH_TARGET)
 
+$(WANPIPE_INSTALLED_KO): $(WANPIPE_KO)
+	cd $(WANPIPE_DIR) && $(MAKE) install
+
+local_depend: $(LIBPRI_DIR) $(WANPIPE_KO)
+
+local_install: $(WANPIPE_INSTALLED_KO)