diff --git a/meta-sysmocom-bsp/conf/machine/sysmocom-alix.conf b/meta-sysmocom-bsp/conf/machine/sysmocom-alix.conf
new file mode 100644
index 0000000000..b4d90be83b
--- /dev/null
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-alix.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for sysmocom alix2d based hardware
+
+require sysmocom-bsc.conf
+MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
diff --git a/meta-sysmocom-bsp/conf/machine/sysmocom-bsc-v2.conf b/meta-sysmocom-bsp/conf/machine/sysmocom-apu2.conf
similarity index 95%
rename from meta-sysmocom-bsp/conf/machine/sysmocom-bsc-v2.conf
rename to meta-sysmocom-bsp/conf/machine/sysmocom-apu2.conf
index c1a8891664..c509468979 100644
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-bsc-v2.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-apu2.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: common_pc
-#@DESCRIPTION: Machine configuration for running a common x86
+#@DESCRIPTION: Machine configuration for sysmocom apu2 based hardware
 
 require conf/machine/include/tune-core2.inc
 require conf/machine/include/genericx86-common.inc
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index 838e49d0ce..94eda1dc46 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -5,7 +5,7 @@ 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 \
            file://gcc6-linking-fix.patch"
-SRCREV_osmobts = "1a2ff06d206fc4ff3cb8170ebe2b5570addc5be3"
+SRCREV_osmobts = "a4bd813081e788012c72f34d31150cdf02db307f"
 SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac"
 PV = "0.4.3+git${SRCPV}"
 PR = "r18.${META_TELEPHONY_OSMO_INC}"