diff --git a/build/openembedded/antlr3/antlr3c-linphone/library.patch b/build/openembedded/antlr3/antlr3c-linphone/library.patch
new file mode 100644
index 000000000..7aeb29508
--- /dev/null
+++ b/build/openembedded/antlr3/antlr3c-linphone/library.patch
@@ -0,0 +1,12 @@
+diff -urN a/runtime/C/Makefile.am b/runtime/C/Makefile.am
+--- a/runtime/C/Makefile.am	2013-07-30 09:46:20.000000000 +0200
++++ b/runtime/C/Makefile.am	2013-07-30 09:52:08.000000000 +0200
+@@ -62,7 +62,7 @@
+ 					include/antlr3treeparser.h				\
+ 					antlr3config.h
+ 
+-libantlr3c_la_LDFLAGS = -no-undefined -avoid-version
++libantlr3c_la_LDFLAGS = -no-undefined
+ libantlr3c_la_LIBADD = $(ANTLR_LIBS)
+ 
+ INCLUDES = -I$(top_srcdir)/include
diff --git a/build/openembedded/antlr3/antlr3c.inc b/build/openembedded/antlr3/antlr3c.inc
new file mode 100644
index 000000000..51418168c
--- /dev/null
+++ b/build/openembedded/antlr3/antlr3c.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Linphone version of antlr3"
+LICENSE = "GPL"
+
+RECIPE_TYPES = "machine native"
+
+DEPENDS = ""
+
+S = "${SRCDIR}/antlr3"
+B = "${SRCDIR}/antlr3/runtime/C"
+CONFIGURE_SCRIPT = "${B}/configure"
+
+inherit autotools-autoreconf pkgconfig library c
+
+do_autoreconf () {
+	pushd runtime/C
+	./autogen.sh
+	popd
+}
+
+EXTRA_OECONF:>TARGET_CPU_x86_64 = " --enable-64bit"
+
+DEPENDS_${PN} += "${DEPENDS}"
+RDEPENDS_${PN} += "${DEPENDS}"
diff --git a/build/openembedded/antlr3/antlr3c_linphone.oe b/build/openembedded/antlr3/antlr3c_linphone.oe
new file mode 100644
index 000000000..cbddb170b
--- /dev/null
+++ b/build/openembedded/antlr3/antlr3c_linphone.oe
@@ -0,0 +1,4 @@
+require antlr3c.inc
+
+SRC_URI = "git://git.linphone.org/antlr3.git;commit=f0dbcbbcd22a7fd9a479ff68d4daa9225fb2f3b1"
+SRC_URI += "file://library.patch"
diff --git a/build/openembedded/belle-sip/belle-sip.inc b/build/openembedded/belle-sip/belle-sip.inc
new file mode 100644
index 000000000..90eab6f4f
--- /dev/null
+++ b/build/openembedded/belle-sip/belle-sip.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "SIP stack from Belledonne Communications"
+LICENSE = "GPL"
+
+RECIPE_TYPES = "machine native"
+
+DEPENDS = "polarssl antlr3c libm"
+
+EXTRA_OECONF += "--with-antlr=${BUILD_SYSROOT}${target_prefix} --with-polarssl=${BUILD_SYSROOT}${target_prefix}"
+
+inherit autotools-autoreconf pkgconfig library c
+
+do_autoreconf () {
+	./autogen.sh
+}
+
+DEPENDS_${PN} += "${DEPENDS}"
+RDEPENDS_${PN} += "${DEPENDS}"
+RDEPENDS_${PN}-dev += "polarssl-dev antlr3c-dev"
diff --git a/build/openembedded/belle-sip/belle-sip_master.oe b/build/openembedded/belle-sip/belle-sip_master.oe
new file mode 100644
index 000000000..ce3702b9d
--- /dev/null
+++ b/build/openembedded/belle-sip/belle-sip_master.oe
@@ -0,0 +1,5 @@
+require belle-sip.inc
+
+S = "${SRCDIR}/belle-sip/"
+
+SRC_URI = "git://git.linphone.org/belle-sip.git;commit=e5a2ddc4456fa15114fd986aadaf9e45a5b1072b"
diff --git a/build/openembedded/conf/layer.conf b/build/openembedded/conf/layer.conf
index be44bc282..1b29844a8 100644
--- a/build/openembedded/conf/layer.conf
+++ b/build/openembedded/conf/layer.conf
@@ -2,7 +2,7 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/*.bb ${LAYERDIR}/libgsm/*.bb ${LAYERDIR}/images/*.bb"
+BBFILES += "${LAYERDIR}/*.bb ${LAYERDIR}/*/*.bb"
 
 BBFILE_COLLECTIONS += "linphone-layer"
 BBFILE_PATTERN_linphone-layer := "^${LAYERDIR}/"
diff --git a/build/openembedded/linphone-common.inc b/build/openembedded/linphone/linphone-common.inc
similarity index 100%
rename from build/openembedded/linphone-common.inc
rename to build/openembedded/linphone/linphone-common.inc
diff --git a/build/openembedded/linphone-common_git.inc b/build/openembedded/linphone/linphone-common_git.inc
similarity index 100%
rename from build/openembedded/linphone-common_git.inc
rename to build/openembedded/linphone/linphone-common_git.inc
diff --git a/build/openembedded/linphone-common_local.inc b/build/openembedded/linphone/linphone-common_local.inc
similarity index 100%
rename from build/openembedded/linphone-common_local.inc
rename to build/openembedded/linphone/linphone-common_local.inc
diff --git a/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb
similarity index 100%
rename from build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb
rename to build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb
diff --git a/build/openembedded/linphone_+git-nogtk-gsm-video.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video.bb
similarity index 100%
rename from build/openembedded/linphone_+git-nogtk-gsm-video.bb
rename to build/openembedded/linphone/linphone_+git-nogtk-gsm-video.bb
diff --git a/build/openembedded/linphone_+git-nogtk-gsm.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm.bb
similarity index 100%
rename from build/openembedded/linphone_+git-nogtk-gsm.bb
rename to build/openembedded/linphone/linphone_+git-nogtk-gsm.bb
diff --git a/build/openembedded/linphone_+git-nogtk.bb b/build/openembedded/linphone/linphone_+git-nogtk.bb
similarity index 100%
rename from build/openembedded/linphone_+git-nogtk.bb
rename to build/openembedded/linphone/linphone_+git-nogtk.bb
diff --git a/build/openembedded/linphone_+local-nogtk-gsm-video-x11.bb b/build/openembedded/linphone/linphone_+local-nogtk-gsm-video-x11.bb
similarity index 100%
rename from build/openembedded/linphone_+local-nogtk-gsm-video-x11.bb
rename to build/openembedded/linphone/linphone_+local-nogtk-gsm-video-x11.bb
diff --git a/build/openembedded/linphone_+local-nogtk-gsm-video.bb b/build/openembedded/linphone/linphone_+local-nogtk-gsm-video.bb
similarity index 100%
rename from build/openembedded/linphone_+local-nogtk-gsm-video.bb
rename to build/openembedded/linphone/linphone_+local-nogtk-gsm-video.bb
diff --git a/build/openembedded/linphone_+local-nogtk-gsm.bb b/build/openembedded/linphone/linphone_+local-nogtk-gsm.bb
similarity index 100%
rename from build/openembedded/linphone_+local-nogtk-gsm.bb
rename to build/openembedded/linphone/linphone_+local-nogtk-gsm.bb
diff --git a/build/openembedded/linphone_+local-nogtk.bb b/build/openembedded/linphone/linphone_+local-nogtk.bb
similarity index 100%
rename from build/openembedded/linphone_+local-nogtk.bb
rename to build/openembedded/linphone/linphone_+local-nogtk.bb
diff --git a/build/openembedded/msamr-common.inc b/build/openembedded/msamr/msamr-common.inc
similarity index 100%
rename from build/openembedded/msamr-common.inc
rename to build/openembedded/msamr/msamr-common.inc
diff --git a/build/openembedded/msamr_git+wb.bb b/build/openembedded/msamr/msamr_git+wb.bb
similarity index 100%
rename from build/openembedded/msamr_git+wb.bb
rename to build/openembedded/msamr/msamr_git+wb.bb
diff --git a/build/openembedded/msamr_git.bb b/build/openembedded/msamr/msamr_git.bb
similarity index 100%
rename from build/openembedded/msamr_git.bb
rename to build/openembedded/msamr/msamr_git.bb
diff --git a/build/openembedded/msamr_local+wb.bb b/build/openembedded/msamr/msamr_local+wb.bb
similarity index 100%
rename from build/openembedded/msamr_local+wb.bb
rename to build/openembedded/msamr/msamr_local+wb.bb
diff --git a/build/openembedded/msamr_local.bb b/build/openembedded/msamr/msamr_local.bb
similarity index 100%
rename from build/openembedded/msamr_local.bb
rename to build/openembedded/msamr/msamr_local.bb
diff --git a/build/openembedded/msilbc-common.inc b/build/openembedded/msilbc/msilbc-common.inc
similarity index 100%
rename from build/openembedded/msilbc-common.inc
rename to build/openembedded/msilbc/msilbc-common.inc
diff --git a/build/openembedded/msilbc_git.bb b/build/openembedded/msilbc/msilbc_git.bb
similarity index 100%
rename from build/openembedded/msilbc_git.bb
rename to build/openembedded/msilbc/msilbc_git.bb
diff --git a/build/openembedded/msilbc_local.bb b/build/openembedded/msilbc/msilbc_local.bb
similarity index 100%
rename from build/openembedded/msilbc_local.bb
rename to build/openembedded/msilbc/msilbc_local.bb
diff --git a/build/openembedded/msx264-common.inc b/build/openembedded/msx264/msx264-common.inc
similarity index 100%
rename from build/openembedded/msx264-common.inc
rename to build/openembedded/msx264/msx264-common.inc
diff --git a/build/openembedded/msx264_git.bb b/build/openembedded/msx264/msx264_git.bb
similarity index 100%
rename from build/openembedded/msx264_git.bb
rename to build/openembedded/msx264/msx264_git.bb
diff --git a/build/openembedded/msx264_local.bb b/build/openembedded/msx264/msx264_local.bb
similarity index 100%
rename from build/openembedded/msx264_local.bb
rename to build/openembedded/msx264/msx264_local.bb
diff --git a/build/openembedded/polarssl/polarssl-linphone/darwin.patch b/build/openembedded/polarssl/polarssl-linphone/darwin.patch
new file mode 100644
index 000000000..9faf5c1b7
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl-linphone/darwin.patch
@@ -0,0 +1,14 @@
+diff -urN a/library/Makefile b/library/Makefile
+--- a/library/Makefile	2013-07-29 17:26:14.000000000 +0200
++++ b/library/Makefile	2013-07-29 17:26:58.000000000 +0200
+@@ -26,7 +26,9 @@
+ 
+ DLEXT=so
+ # OSX shared library extension:
+-# DLEXT=dylib
++ifdef DARWIN 
++DLEXT=dylib
++endif
+ 
+ # Windows shared library extension:
+ ifdef WINDOWS
diff --git a/build/openembedded/polarssl/polarssl-linphone/soname.patch b/build/openembedded/polarssl/polarssl-linphone/soname.patch
new file mode 100644
index 000000000..29a1ca955
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl-linphone/soname.patch
@@ -0,0 +1,51 @@
+diff -urN polarssl.orig/library/Makefile polarssl.new/library/Makefile
+--- polarssl.orig/library/Makefile	2013-08-22 10:24:46.353700982 +0200
++++ polarssl.new/library/Makefile	2013-08-22 10:21:43.933733318 +0200
+@@ -28,12 +28,14 @@
+ # OSX shared library extension:
+ ifdef DARWIN 
+ DLEXT=dylib
++SONAME=libpolarssl.0.dylib
+ endif
+ 
+ # Windows shared library extension:
+ ifdef WINDOWS
+ DLEXT=dll
+ LDFLAGS += -lws2_32
++SONAME=libpolarssl-0.dll
+ endif
+ 
+ OBJS=	aes.o		arc4.o		asn1parse.o		\
+@@ -73,15 +75,17 @@
+ 
+ libpolarssl.so: libpolarssl.a
+ 	echo "  LD    $@"
+-	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
++	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $(SONAME) $(OBJS)
++	ln -s $(SONAME) $@
+ 
+ libpolarssl.dylib: libpolarssl.a
+ 	echo "  LD    $@"
+-	$(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)
++	$(CC) ${LDFLAGS} -dynamiclib -Wl,-install_name,$(SONAME) -o $(SONAME) $(OBJS)
++	ln -s $(SONAME) $@
+ 
+ libpolarssl.dll: libpolarssl.a 
+ 	echo "  LD    $@" 
+-	$(CC) -shared -Wl,-soname,$@,--out-implib,$@.a -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32 
++	$(CC) -shared -Wl,-soname,$(SONAME),--out-implib,$@.a -o $(SONAME) $(OBJS) -lws2_32 -lwinmm -lgdi32 
+ 
+ .c.o:
+ 	echo "  CC    $<"
+diff -urN polarssl.orig/Makefile polarssl.new/Makefile
+--- polarssl.orig/Makefile	2013-08-22 10:24:34.585703377 +0200
++++ polarssl.new/Makefile	2013-08-22 10:19:26.801749343 +0200
+@@ -21,7 +21,7 @@
+ 	cp -r include/polarssl $(DESTDIR)/include
+ 	
+ 	mkdir -p $(DESTDIR)/lib
+-	cp library/libpolarssl.* $(DESTDIR)/lib
++	cp -d library/libpolarssl* $(DESTDIR)/lib
+ 	
+ 	mkdir -p $(DESTDIR)/bin
+ 	cp library/libpolarssl*.dll $(DESTDIR)/bin
diff --git a/build/openembedded/polarssl/polarssl.inc b/build/openembedded/polarssl/polarssl.inc
new file mode 100644
index 000000000..ada34b27a
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "SSL/TLS library"
+LICENSE = "GPL"
+
+RECIPE_TYPES = "machine native"
+
+DEPENDS = ""
+
+inherit c make pkgconfig library
+
+EXTRA_OEMAKE += " SHARED=1"
+EXTRA_OEMAKE:>TARGET_OS_darwin = " DARWIN=1"
+EXTRA_OEMAKE:>TARGET_OS_mingw32 = " WINDOWS=1"
+
+PACKAGES += "${PN}-utils"
+
+MAKE_DESTDIR = "DESTDIR=${D}/${prefix}"
+
+FILES_${PN} += "${sharedlibdir}/*${SOLIBSDEV}"
+FILES_${PN}-dev += "!${sharedlibdir}/*${SOLIBSDEV}"
+FILES_${PN}-utils += "${bindir}/polarssl_*"
+
+DEPENDS_${PN} += "${DEPENDS}"
+RDEPENDS_${PN} += "${DEPENDS}"
diff --git a/build/openembedded/polarssl/polarssl_linphone.oe b/build/openembedded/polarssl/polarssl_linphone.oe
new file mode 100644
index 000000000..5d4d41d30
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl_linphone.oe
@@ -0,0 +1,7 @@
+require polarssl.inc
+
+S = "${SRCDIR}/polarssl/"
+
+SRC_URI = "git://git.linphone.org/polarssl.git;commit=cecb44e4f13f42f793dde34b42793e1ebcce91a5"
+SRC_URI += "file://darwin.patch"
+SRC_URI += "file://soname.patch"