diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf
index 4b495c4cd3..a6a16c937f 100644
--- a/config/boards/bananapim2plus.conf
+++ b/config/boards/bananapim2plus.conf
@@ -4,7 +4,7 @@ LINUXFAMILY="sun8i"
 BOOTCONFIG="Sinovoip_BPI_M2_Plus_defconfig"
 #
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir dhd hci_uart rfcomm hidp"
-MODULES_NEXT="brcmfmac"
+MODULES_NEXT="brcmfmac g_serial"
 CPUMIN="240000"
 CPUMAX="1200000"
 #
@@ -13,7 +13,7 @@ CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
 
 CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
+DESKTOP_BETA_TARGET="stretch:next"
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
 #
diff --git a/config/sources/sun8i.conf b/config/sources/sun8i.conf
index 97b2902de3..d99ca7402c 100644
--- a/config/sources/sun8i.conf
+++ b/config/sources/sun8i.conf
@@ -32,7 +32,7 @@ family_tweaks_s()
 {
 	# enable serial gadget on OTG port since the board doesn't have Ethernet
 	case ${BOARD} in
-		orangepilite|nanopi*|orangepizero*)
+		orangepilite|nanopi*|orangepizero*|bananapim2plus)
 		mkdir -p $SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d
 		if [[ $BRANCH == default ]]; then
 			cat <<-EOF > $SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d/10-switch-role.conf
diff --git a/lib/desktop.sh b/lib/desktop.sh
index 9ab167da8d..01eba91161 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -38,6 +38,7 @@ install_desktop ()
 	chroot $SDCARD /bin/bash -c "dpkg -x /root/numix-icon-theme_0.3+922~201711061547~ubuntu16.04.1_all.deb /" >> $DEST/debug/install.log 2>&1
 	chroot $SDCARD /bin/bash -c "gtk-update-icon-cache /usr/share/icons/Numix" >> $DEST/debug/install.log 2>&1
 	chroot $SDCARD /bin/bash -c "gtk-update-icon-cache /usr/share/icons/Numix-Light" >> $DEST/debug/install.log 2>&1
+	rm $SDCARD/root/numix-icon-theme_0.3+922~201711061547~ubuntu16.04.1_all.deb
 
 	# Adjust menu
 	sed -i '0,/xfce4-about.desktop/s//armbian-donate.desktop/' $SDCARD/etc/xdg/menus/xfce-applications.menu
diff --git a/patch/kernel/sunxi-next/sunxi-hdmi-enable-sinovoip-bananam2plus.patch b/patch/kernel/sunxi-next/sunxi-hdmi-enable-sinovoip-bananam2plus.patch
new file mode 100644
index 0000000000..0bbc708074
--- /dev/null
+++ b/patch/kernel/sunxi-next/sunxi-hdmi-enable-sinovoip-bananam2plus.patch
@@ -0,0 +1,94 @@
+diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
+old mode 100644
+new mode 100755
+index d756ff8..014bbc8
+--- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
++++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
+@@ -43,7 +43,6 @@
+ /dts-v1/;
+ #include "sun8i-h3.dtsi"
+ #include "sunxi-common-regulators.dtsi"
+-
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
+ 
+@@ -61,6 +60,17 @@
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
++	connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++
+ 	leds {
+ 		compatible = "gpio-leds";
+ 		pinctrl-names = "default";
+@@ -178,6 +188,40 @@
+ 	status = "okay";
+ };
+ 
++&codec {
++	allwinner,audio-routing =
++		"Line Out", "LINEOUT",
++		"MIC1", "Mic",
++		"Mic",  "MBIAS";
++	status = "okay";
++};
++
++&de {
++	status = "okay";
++};
++
++&hdmi {
++	status = "okay";
++};
++
++&hdmi_out {
++	hdmi_out_con: endpoint {
++		remote-endpoint = <&hdmi_con_in>;
++	};
++};
++
++&i2s2 {
++	status = "okay";
++};
++
++&mixer0 {
++	status = "okay";
++};
++
++&tcon0 {
++	status = "okay";
++};
++
+ &ohci0 {
+ 	status = "okay";
+ };
+@@ -190,6 +234,20 @@
+ 	status = "okay";
+ };
+ 
++&r_i2c {
++	status = "okay";
++
++	reg_sy8106a: regulator@65 {
++		compatible = "silergy,sy8106a";
++		reg = <0x65>;
++		regulator-name = "vdd-cpux";
++		regulator-min-microvolt = <1000000>;
++		regulator-max-microvolt = <1400000>;
++		regulator-boot-on;
++		regulator-always-on;
++	};
++};
++
+ &r_pio {
+ 	pwr_led_bpi_m2p: led_pins@0 {
+ 		pins = "PL10";