--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,8 @@
+BASE=.
+
+include $(BASE)/../../../rules.mk
+include $(BASE)/../../../include/package.mk
+
 EXTRA_DIST =
 SUBDIRS = . src
 AUTOMAKE_OPTS = foreign
@@ -299,7 +304,7 @@ endif
 ##
 fs_encode_SOURCES = src/fs_encode.c
 fs_encode_CFLAGS = $(AM_CFLAGS)
-fs_encode_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+fs_encode_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
 fs_encode_LDADD = libfreeswitch.la -lcrypt -lrt
 
 ##
@@ -307,7 +312,7 @@ fs_encode_LDADD = libfreeswitch.la -lcry
 ##
 tone2wav_SOURCES = src/tone2wav.c
 tone2wav_CFLAGS  = $(AM_CFLAGS)
-tone2wav_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+tone2wav_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
 tone2wav_LDADD   = libfreeswitch.la -lcrypt -lrt
 
 ##
@@ -586,10 +591,13 @@ speex-reconf:
 
 tiff-reconf:
 	cd libs/tiff-3.8.2 && autoreconf -fi
-	cd libs/tiff-3.8.2 && sh ./configure.gnu
+	cd libs/tiff-3.8.2 && sh ./configure.gnu --host=$(GNU_TARGET_NAME)
 	cd libs/spandsp && autoreconf -fi
-	cd libs/spandsp && sh ./configure.gnu
-	make mod_voipcodecs-clean
+	cd libs/spandsp && sh ./configure.gnu --host=$(GNU_TARGET_NAME) --prefix=$(prefix)
+	cd libs/tiff-3.8.2 && $(MAKE)
+
+spandsp-reconf: tiff-reconf
+	cd libs/spandsp && $(MAKE)
 
 python-reconf:
 	rm -f src/mod/languages/mod_python/Makefile
@@ -612,12 +620,6 @@ iks-reconf:
 	cd libs/iksemel && sh ./configure.gnu --prefix=$(prefix)
 	$(MAKE) mod_dingaling-clean
 
-spandsp-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:
 	cd libs/sofia-sip && sh ./autogen.sh
 	cd libs/sofia-sip && $(MAKE) clean