--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,7 @@
+BASE=.
+
+include $(BASE)/build/openwrt_rules.mk
+
 EXTRA_DIST =
 SUBDIRS = . src
 AUTOMAKE_OPTIONS = foreign
@@ -165,7 +169,6 @@ ZRTP_LIBS = -lbn -lzrtp
 libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
 libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
 CORE_LIBS += libs/libzrtp/projects/gnu/build/libzrtp.a
-LIBS += libs/libzrtp/third_party/bnlib/libbn.a
 endif
 
 library_includedir      = $(includedir)
@@ -423,7 +426,7 @@ $(switch_builddir)/quiet_libtool: $(swit
 	@cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool
 
 build/print_git_revision: build/print_git_revision.c
-	$(CC) -o $@ $<
+	$(HOSTCC) -o $@ $<
 
 src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
 	@cat $< > $@; \
@@ -649,7 +652,9 @@ sndfile-reconf:
 
 tiff-reconf:
 	cd libs/tiff-4.0.2 && autoreconf -fi
-	cd libs/tiff-4.0.2 && sh ./configure.gnu
+	cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
+	cd libs/spandsp && autoreconf -fi
+	cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
 	cd libs/tiff-4.0.2 && make
 
 python-reconf:
@@ -674,9 +679,6 @@ iks-reconf:
 	$(MAKE) mod_dingaling-clean
 
 spandsp-reconf: tiff-reconf
-	cd libs/spandsp && $(MAKE) clean || echo
-	cd libs/spandsp && autoreconf -fi
-	cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix)
 	cd libs/spandsp && $(MAKE)
 
 sofia-reconf: