diff --git a/makeboarddeb.sh b/makeboarddeb.sh
index 1028ad81c3..242348dbdd 100644
--- a/makeboarddeb.sh
+++ b/makeboarddeb.sh
@@ -135,8 +135,8 @@ create_board_package()
 	IMAGE_TYPE=$IMAGE_TYPE
 	EOF
 
-	# add USB OTG port mode switcher
-	install -m 755 $SRC/lib/scripts/sunxi-musb $destination/usr/bin
+	# add USB OTG port mode switcher (obsolete - will be handled with DT overlays)
+	# install -m 755 $SRC/lib/scripts/sunxi-musb $destination/usr/bin
 
 	# armbianmonitor (currently only to toggle boot verbosity and log upload)
 	install -m 755 $SRC/lib/scripts/armbianmonitor/armbianmonitor $destination/usr/bin
@@ -286,7 +286,7 @@ create_board_package()
 	install -m 755 $SRC/lib/scripts/log2ram/log2ram.hourly $destination/etc/cron.daily/log2ram
 	cp $SRC/lib/scripts/log2ram/log2ram.default $destination/etc/default/log2ram.dpkg-dist
 
-	if [[ $LINUXFAMILY == sun*i ]]; then
+	if [[ $LINUXFAMILY == sun*i* ]]; then
 		install -m 755 $SRC/lib/scripts/armbian-add-overlay $destination/usr/sbin
 		if [[ $BRANCH == default ]]; then
 			# add soc temperature app
@@ -297,12 +297,13 @@ create_board_package()
 				arm-linux-gnueabihf-gcc $SRC/lib/scripts/sunxi-temp/sunxi_tp_temp.c -o $destination/usr/bin/sunxi_tp_temp
 			fi
 		fi
-
-		# convert and add fex files
-		mkdir -p $destination/boot/bin
-		for i in $(ls -w1 $SRC/lib/config/fex/*.fex | xargs -n1 basename); do
-			fex2bin $SRC/lib/config/fex/${i%*.fex}.fex $destination/boot/bin/${i%*.fex}.bin
-		done
+		if [[ $BRANCH == default ]]; then
+			# convert and add fex files
+			mkdir -p $destination/boot/bin
+			for i in $(ls -w1 $SRC/lib/config/fex/*.fex | xargs -n1 basename); do
+				fex2bin $SRC/lib/config/fex/${i%*.fex}.fex $destination/boot/bin/${i%*.fex}.bin
+			done
+		fi
 	fi
 
 	if [[ ( $LINUXFAMILY == sun*i || $LINUXFAMILY == pine64 ) && $BRANCH == default ]]; then
@@ -312,7 +313,7 @@ create_board_package()
 		echo "export VDPAU_OSD=1" > $destination/etc/profile.d/90-vdpau.sh
 		chmod 755 $destination/etc/profile.d/90-vdpau.sh
 	fi
-	if [[ ( $LINUXFAMILY == sun50iw2 || $LINUXFAMILY == sun8i || $LINUXFAMILY == pine64 ) && $BRANCH == dev ]]; then
+	if [[ ( $LINUXFAMILY == sun50i* || $LINUXFAMILY == sun8i ) && $BRANCH == dev ]]; then
 		# add mpv config for x11 output - slow, but it works compared to no config at all
 		mkdir -p $destination/etc/mpv/
 		cat <<-EOF > $destination/etc/mpv/mpv.conf