diff --git a/recipes-sysmobts/osmo-bts/files/gcc6-linking-fix.patch b/recipes-sysmobts/osmo-bts/files/gcc6-linking-fix.patch
new file mode 100644
index 0000000..c97839f
--- /dev/null
+++ b/recipes-sysmobts/osmo-bts/files/gcc6-linking-fix.patch
@@ -0,0 +1,12 @@
+Index: git/src/osmo-bts-sysmo/l1_if.h
+===================================================================
+--- git.orig/src/osmo-bts-sysmo/l1_if.h
++++ git/src/osmo-bts-sysmo/l1_if.h
+@@ -132,6 +132,6 @@ int bts_check_for_ciph_cmd(struct femtol
+ void bts_check_for_first_ciphrd(struct femtol1_hdl *fl1h,
+ 				GsmL1_MsgUnitParam_t *msgUnitParam,
+ 				struct gsm_lchan *lchan);
+-inline int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,
++int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,
+ 			const uint8_t ms_power, const float rxLevel);
+ #endif /* _FEMTO_L1_H */
diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index 814b216..838e49d 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -3,7 +3,8 @@ LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
 SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/0.3.5-stable;name=osmobts;destsuffix=git \
-           git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
+           git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc \
+           file://gcc6-linking-fix.patch"
 SRCREV_osmobts = "1a2ff06d206fc4ff3cb8170ebe2b5570addc5be3"
 SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac"
 PV = "0.4.3+git${SRCPV}"