diff --git a/Makefile.am b/Makefile.am
index 58dc0abfaf83e52596353cac5b6fdcd734592dcb..48c00399d8c73004156feae642b732a8fdd4ee34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = utilspp stund src ringtones 
+SUBDIRS = deps utilspp stund src ringtones 
 EXTRA_DIST = tools/*.sh
diff --git a/Makefile.cvs b/Makefile.cvs
index cfcfcc4d7bf192720e733ef1a5bc500362af8285..ed0107a84246b8e482406720d840c61593203072 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -1,4 +1,6 @@
-all:
+DEPS=deps/ccrtp-1.3.5 deps/libosip2-2.2.1 deps/portaudio deps/commoncpp2-1.3.21 deps/libeXosip2-1.9.1-pre17
+
+all: $(DEPS)
 	@echo "This Makefile is only for the CVS repository"
 	@echo "This will be deleted before making the distribution"
 	@echo ""
@@ -8,3 +10,14 @@ all:
 		exit 1 ;\
 	fi
 	$(MAKE) -f admin/Makefile.common cvs
+
+
+deps/ccrtp-1.3.5: deps/ccrtp-1.3.5.tar.gz
+	cd deps/ && \
+	tar zxvf ccrtp-1.3.5.tar.gz
+
+deps/: %.tar.gz
+	cd deps/ && \
+	tar zxvf $<
+
+
diff --git a/config.h.in b/config.h.in
index 0962968911700cf59b15b3ff3e64c7ef917107e4..5c94c8f6cedb4f1d639f2c11e17e9b0968581ad6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -18,9 +18,6 @@
 /* Define to 1 if you have the <ostream> header file. */
 #undef HAVE_OSTREAM
 
-/* Define to 1 if you have the <portaudio.h> header file. */
-#undef HAVE_PORTAUDIO_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
diff --git a/configure.ac b/configure.ac
index 8b0e10a50fc5394f5d35b813aa88e5b7932e8db0..8d6fc6b28ac173ff5c2f5d9a890d45bff9104d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,8 @@ AC_SUBST(RPM_VERSION)
 
 LIBS="$LIBS -lstdc++"
 
+ac_configure_args="$ac_configure_args --disable-josua"
+
 dnl
 dnl Solaris pkgadd support definitions
 PKGADD_PKG="SFLPhoned"
@@ -55,7 +57,6 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS( \
 ostream \
 eXosip2/eXosip.h \
-portaudio.h \
 )
 
 LIBCCGNU2_MIN_VERSION=1.3.1
@@ -90,18 +91,23 @@ SFLPHONE_LIBS="$SFLPHONE_LIBS $libexosip2_LIBS"
 
 dnl AC_SUBST(LIBQT)
 
-if test $ac_cv_header_portaudio_h = no; then
-   AC_MSG_ERROR([*** missing portaudio.h. You need a working PortAudio installation. See http://www.portaudio.com])
-else 
-   portaudio_LIBS="-lportaudio "
-   portaudio_CFLAGS="-DAUDIO_PORTAUDIO "
-fi
-
+dnl if test $ac_cv_header_portaudio_h = no; then
+dnl   ;
+   dnl AC_MSG_WARNING([*** You have an already installed version of portaudio. We'll use this version instead of the version included in the package. This might broke the compilation.])
+dnl else
+dnl fi
+LDFLAGS="$LDFLAGS -L"'$(top_srcdir)/portaudio/lib/'
+CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)/portaudio/pa_common/'
+CXXFLAGS="$CXXFLAGS"' `bash $(top_srcdir)/portaudio/portaudio-config --cflags`'
+
+portaudio_LIBS='`bash $(top_srcdir)/portaudio/portaudio-config --libs`'
+portaudio_CFLAGS="-DAUDIO_PORTAUDIO "
 SFLPHONE_LIBS="$SFLPHONE_LIBS $portaudio_LIBS"
 SFLPHONE_CXXFLAGS=="$SFLPHONE_CXXFLAGS $portaudio_CFLAGS"
 AC_SUBST(portaudio_CFLAGS)
 AC_SUBST(portaudio_LIB)
 
+
 AC_SUBST(SFLPHONE_CXXFLAGS)
 AC_SUBST(SFLPHONE_LIBS)
 
@@ -142,11 +148,19 @@ fi
 AC_SUBST(LIB_DNSSD)
 AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")	
 
+AC_CONFIG_SUBDIRS(\
+deps/ccrtp-1.3.5 \
+deps/commoncpp2-1.3.21 \
+deps/libeXosip2-1.9.1-pre17 \
+deps/libosip2-2.2.1 \
+deps/portaudio)
+
 dnl AC_CONFIG_FILES(
 AC_OUTPUT(
 sflphone.spec \
 sflphoned-fedora.spec \
 Makefile \
+deps/Makefile \
 src/Makefile \
 src/sflphone \
 src/audio/Makefile \
diff --git a/deps/Makefile.am b/deps/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..4a17fbffda9180e4690f394e2adbf1ceb5c61e70
--- /dev/null
+++ b/deps/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = \
+	ccrtp-1.3.5 \
+	commoncpp2-1.3.21 \
+	libeXosip2-1.9.1-pre17 \
+	libosip2-2.2.1 \
+	portaudio
+
diff --git a/deps/ccrtp-1.3.5.tar.gz b/deps/ccrtp-1.3.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..89f45b25b91631876985318b9a75c5a5e6c09f3e
Binary files /dev/null and b/deps/ccrtp-1.3.5.tar.gz differ
diff --git a/deps/commoncpp2-1.3.21.tar.gz b/deps/commoncpp2-1.3.21.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..bc04359d53505b299bfe60b84456bb131aaf6b48
Binary files /dev/null and b/deps/commoncpp2-1.3.21.tar.gz differ
diff --git a/deps/libeXosip2-1.9.1-pre17.tar.gz b/deps/libeXosip2-1.9.1-pre17.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5e9c76d2f22e486da7ee1d049c56258bcb91fe2c
Binary files /dev/null and b/deps/libeXosip2-1.9.1-pre17.tar.gz differ
diff --git a/deps/libosip2-2.2.1.tar.gz b/deps/libosip2-2.2.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c83daa201cd430dd69a06e8d82e5a6bf4a37221b
Binary files /dev/null and b/deps/libosip2-2.2.1.tar.gz differ
diff --git a/deps/pa_snapshot_v19.tar.gz b/deps/pa_snapshot_v19.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3b70a021dabe2f952b1872bf28d017ce98ea7453
Binary files /dev/null and b/deps/pa_snapshot_v19.tar.gz differ