diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb
index 3d4a00a7a4..566ec26726 100644
--- a/recipes-osmocom/meta/meta-toolchain-osmo.bb
+++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb
@@ -1,6 +1,18 @@
 #TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg"
 TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}"
-TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}-${DATETIME}"
+TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}"
+TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}"
 PROVIDES = "meta-toolchain-sdk"
 require recipes-core/meta/meta-toolchain.bb
+
+do_populate_sdk_append() {
+    bb.build.exec_func("create_symlink", d)
+}
+
+
+create_symlink() {
+        cd ${SDK_DEPLOY}/
+        rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh
+        ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_BASENAME}.sh
+}