diff --git a/meta-telephony/recipes-misc/sofia-sip/files/msg_parser.c.diff b/meta-telephony/recipes-misc/sofia-sip/files/msg_parser.c.diff
new file mode 100644
index 0000000000..66c73395de
--- /dev/null
+++ b/meta-telephony/recipes-misc/sofia-sip/files/msg_parser.c.diff
@@ -0,0 +1,35 @@
+--- sofia-sip-1.12.11+20110422.1.orig/libsofia-sip-ua/msg/msg_parser.c
++++ sofia-sip-1.12.11+20110422.1/libsofia-sip-ua/msg/msg_parser.c
+@@ -2468,8 +2468,6 @@
+ msg_header_t **
+ msg_hclass_offset(msg_mclass_t const *mc, msg_pub_t const *mo, msg_hclass_t *hc)
+ {
+-  int i;
+-
+   assert(mc && hc);
+ 
+   if (mc == NULL || hc == NULL)
+@@ -2484,9 +2482,20 @@
+   }
+   else
+     /* Header has no name. */
+-    for (i = 0; i <= 6; i++)
+-      if (hc->hc_hash == mc->mc_request[i].hr_class->hc_hash)
+-	return (msg_header_t **)((char *)mo + mc->mc_request[i].hr_offset);
++    if      (hc->hc_hash == mc->mc_request[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_request[0].hr_offset);
++    else if (hc->hc_hash == mc->mc_status[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_status[0].hr_offset);
++    else if (hc->hc_hash == mc->mc_separator[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_separator[0].hr_offset);
++    else if (hc->hc_hash == mc->mc_payload[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_payload[0].hr_offset);
++    else if (hc->hc_hash == mc->mc_unknown[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_unknown[0].hr_offset);
++    else if (hc->hc_hash == mc->mc_error[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_error[0].hr_offset);
++    else if (hc->hc_hash == mc->mc_multipart[0].hr_class->hc_hash)
++       return (msg_header_t **)((char *)mo + mc->mc_multipart[0].hr_offset);
+ 
+   return NULL;
+ }
diff --git a/meta-telephony/recipes-misc/sofia-sip/sofia-sip.inc b/meta-telephony/recipes-misc/sofia-sip/sofia-sip.inc
index cd987faa6d..d282ed11cf 100644
--- a/meta-telephony/recipes-misc/sofia-sip/sofia-sip.inc
+++ b/meta-telephony/recipes-misc/sofia-sip/sofia-sip.inc
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc"
 SECTION = "libs"
 DEPENDS = "glib-2.0 openssl"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+SRC_URI = "\
+    ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
+    file://msg_parser.c.diff \
+    "
 
 inherit autotools pkgconfig
 
diff --git a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
index e8db2bc99a..9101886c66 100644
--- a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -2,7 +2,7 @@ require ${PN}.inc
 
 S = "${WORKDIR}/git"
 SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2"
-SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
+SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
 PV = "0.9.0+gitr${SRCPV}"
 PR = "r0"