diff --git a/.gitignore b/.gitignore
index df1c80316..a06368361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,13 @@ coreapi/test_ecc
 coreapi/test_lsd
 gtk/version_date.h
 
+daemon/linphone-daemon
+daemon/linphone-daemon-pipetest
+tools/lpc2xml_test
+tools/xml2lpc_test
+*.la
+*.lo
+*.deps
+*.libs
+share/certdata.txt
+coreapi/test_numbers
diff --git a/build/Makefile.am b/build/Makefile.am
index 84ac3e909..8145474f1 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS=macos
 
+EXTRA_DIST = openembedded
+
diff --git a/build/openembedded/linphone-common.inc b/build/openembedded/linphone-common.inc
index fde92896f..1bcd9d6de 100644
--- a/build/openembedded/linphone-common.inc
+++ b/build/openembedded/linphone-common.inc
@@ -6,7 +6,7 @@ SECTION_linphonec =  "console/network"
 
 SRC_URI_append_igep0020 = " file://alsa_8khz.patch"
 
-DEPENDS = "intltool readline libosip2 libexosip2 speex alsa-lib spandsp"
+DEPENDS = "intltool-native readline libosip2 libexosip2 speex alsa-lib spandsp"
 DEPENDS_append_video = " libxv ffmpeg libv4l"
 DEPENDS_append_gtk = " gtk+"
 DEPENDS_append_gsm = " libgsm"
@@ -38,22 +38,22 @@ LINPHONE_OE_ENABLE_GTK_UI = "no"
 LINPHONE_OE_ENABLE_GTK_UI_gtk = "yes"
 
 do_install_append(){
-	install -d ${D}${bindir}
+        install -d ${D}${bindir}
 }
 
 EXTRA_OECONF = " \
-		${LINPHONE_OE_ENABLE_TESTS} \
+                ${LINPHONE_OE_ENABLE_TESTS} \
                 ${LINPHONE_OE_ENABLE_VIDEO} \
-		${LINPHONE_OE_ENABLE_X11} \
+                ${LINPHONE_OE_ENABLE_X11} \
                 --enable-alsa \
                 --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --disable-manual --enable-tests=yes \
-		--enable-console_ui=${LINPHONE_OE_ENABLE_CONSOLE_UI} \
-		--enable-gtk_ui=${LINPHONE_OE_ENABLE_GTK_UI} \
-		--with-realprefix=/usr \
-		"
+                --enable-console_ui=${LINPHONE_OE_ENABLE_CONSOLE_UI} \
+                --enable-gtk_ui=${LINPHONE_OE_ENABLE_GTK_UI} \
+                --with-realprefix=/usr \
+                "
 
 EXTRA_OEMAKE = " V=1"
 
@@ -61,15 +61,15 @@ PACKAGES_gtk = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale ${PN}c linphone
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN}c linphone-rings liblinphone libmediastreamer-bin libmediastreamer libortp ${PN}-utils"
 
 FILES_${PN} = " \ 
-	    ${bindir}/linphone \
+            ${bindir}/linphone \
             ${datadir}/linphone \
- 	    ${datadir}/pixmaps \
-	    ${datadir}/applications \
-	    ${datadir}/gnome/apps \
-	    ${datadir}/sounds/linphone/hello8000.wav \
-	    ${datadir}/sounds/linphone/hello16000.wav \
-	    ${datadir}/images/nowebcamCIF.jpg \
-	    "
+             ${datadir}/pixmaps \
+            ${datadir}/applications \
+            ${datadir}/gnome/apps \
+            ${datadir}/sounds/linphone/hello8000.wav \
+            ${datadir}/sounds/linphone/hello16000.wav \
+            ${datadir}/images/nowebcamCIF.jpg \
+            "
 FILES_${PN}c = "${bindir}/linphonec ${bindir}/linphone-daemon ${bindir}/linphone-daemon-pipetest ${bindir}/linphonecsh ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
 FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
 FILES_liblinphone = "${libdir}/liblinphone.so.*"
diff --git a/build/openembedded/linphone-common_git.inc b/build/openembedded/linphone-common_git.inc
index 78b77e390..c8d2a9602 100644
--- a/build/openembedded/linphone-common_git.inc
+++ b/build/openembedded/linphone-common_git.inc
@@ -12,19 +12,19 @@ S = "${WORKDIR}/linphone"
 # There is also a problem with autogen and AC_SUBST
 # note: don't use a ssh key with password, it does not work.
 do_fetch_prepend () {
-	import os,bb
-	bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}")
-	os.system("rm -rf ${LINPHONE_TMP_DIR}")
-	os.system("mkdir -p ${LINPHONE_TMP_DIR}")
+        import os,bb
+        bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}")
+        os.system("rm -rf ${LINPHONE_TMP_DIR}")
+        os.system("mkdir -p ${LINPHONE_TMP_DIR}")
 
-	bb.note("Hack cloning linphone !recursively")
-	os.system("cd ${LINPHONE_TMP_DIR}; git clone --depth 1 --recursive ${L_GIT_SRC_URI} linphone")
+        bb.note("Hack cloning linphone !recursively")
+        os.system("cd ${LINPHONE_TMP_DIR}; git clone --depth 1 --recursive ${L_GIT_SRC_URI} linphone")
 
-	bb.note("Hack launching autogen.sh manually")
-	os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh")
+        bb.note("Hack launching autogen.sh manually")
+        os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh")
 
-	bb.note("Hack preparing linphone.tar.gz")
-	os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz --exclude .git linphone")
+        bb.note("Hack preparing linphone.tar.gz")
+        os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz --exclude .git linphone")
 }
 
 require linphone-common.inc
diff --git a/build/openembedded/linphone-common_local.inc b/build/openembedded/linphone-common_local.inc
index 970ccc0db..aaa5b9a15 100644
--- a/build/openembedded/linphone-common_local.inc
+++ b/build/openembedded/linphone-common_local.inc
@@ -1,11 +1,12 @@
-SRC_URI = "file://${HOME}/linphone-3.5.2.tar.gz"
+SRC_URI = "file://${HOME}/linphone-3.6.1.tar.gz"
 
-S = "${WORKDIR}/linphone-3.5.2"
+S = "${WORKDIR}/linphone-3.6.1"
 
 require linphone-common.inc
 
 do_configure_prepend () {
-	./autogen.sh
+        ./autogen.sh
+        libtoolize --copy --force
 }
 
 #Required to avoid compile errors on May 2011.
diff --git a/build/openembedded/msamr-common.inc b/build/openembedded/msamr-common.inc
index 8190fb2bc..4f35dafc3 100644
--- a/build/openembedded/msamr-common.inc
+++ b/build/openembedded/msamr-common.inc
@@ -11,9 +11,9 @@ DEPENDS_append_wideband = " vo-amrwbenc"
 MSAMR_WIDEBAND = ""
 MSAMR_WIDEBAND_wideband = "--enable-wideband"
 
-EXTRA_OECONF =	"\
-		${MSAMR_WIDEBAND} \
-		"
+EXTRA_OECONF =        "\
+                ${MSAMR_WIDEBAND} \
+                "
 
 FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
 FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
diff --git a/build/openembedded/msamr_local+wb.bb b/build/openembedded/msamr_local+wb.bb
index 993a7f31b..e63ef3367 100644
--- a/build/openembedded/msamr_local+wb.bb
+++ b/build/openembedded/msamr_local+wb.bb
@@ -3,7 +3,8 @@ SRC_URI = "file://${HOME}/msamr-0.0.2.tar.gz"
 S = "${WORKDIR}/msamr-0.0.2"
 
 do_configure_prepend () {
-	./autogen.sh
+        ./autogen.sh
+        libtoolize --copy --force
 }
 
 OVERRIDES_append = ":wideband"
diff --git a/build/openembedded/msamr_local.bb b/build/openembedded/msamr_local.bb
index 3c5b309ff..43c434ffb 100644
--- a/build/openembedded/msamr_local.bb
+++ b/build/openembedded/msamr_local.bb
@@ -3,7 +3,8 @@ SRC_URI = "file://${HOME}/msamr-0.0.2.tar.gz"
 S = "${WORKDIR}/msamr-0.0.2"
 
 do_configure_prepend () {
-	./autogen.sh
+        ./autogen.sh
+        libtoolize --copy --force
 }
 
 DEFAULT_PREFERENCE="-1"
diff --git a/build/openembedded/msilbc_local.bb b/build/openembedded/msilbc_local.bb
index a1c168da7..95fcd6466 100644
--- a/build/openembedded/msilbc_local.bb
+++ b/build/openembedded/msilbc_local.bb
@@ -3,7 +3,8 @@ SRC_URI = "file://${HOME}/msilbc-2.0.3.tar.gz"
 S = "${WORKDIR}/msilbc-2.0.3"
 
 do_configure_prepend () {
-	./autogen.sh
+        ./autogen.sh
+        libtoolize --copy --force
 }
 
 DEFAULT_PREFERENCE="-1"
diff --git a/build/openembedded/msx264_local.bb b/build/openembedded/msx264_local.bb
index 067bd85e3..ef7ab1a82 100644
--- a/build/openembedded/msx264_local.bb
+++ b/build/openembedded/msx264_local.bb
@@ -3,7 +3,7 @@ SRC_URI = "file://${HOME}/msx264-1.4.2.tar.gz"
 S = "${WORKDIR}/msx264-1.4.2"
 
 do_configure_prepend () {
-	./autogen.sh
+        ./autogen.sh
 }
 
 DEFAULT_PREFERENCE="-1"