diff --git a/config/boards/README.md b/config/boards/README.md
index 8616c3e1d1..d9ed9f32ce 100644
--- a/config/boards/README.md
+++ b/config/boards/README.md
@@ -17,3 +17,4 @@
 | KERNEL_TARGET | legacy,current,dev |
 | FULL_DESKTOP | yes/no = install Office, Thunderbird, ... |
 | DESKTOP_AUTOLOGIN | yes/no |
+| PACKAGE_LIST_DESKTOP_BOARD | space delimited packages to be installed on this boards desktop build |
diff --git a/config/boards/bananapim64.conf b/config/boards/bananapim64.conf
index 8bb6b8d364..8ea67b0010 100644
--- a/config/boards/bananapim64.conf
+++ b/config/boards/bananapim64.conf
@@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="bananapi_m64_defconfig"
 KERNEL_TARGET="current,dev"
+PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
diff --git a/config/boards/lime-a64.conf b/config/boards/lime-a64.conf
index c1d52ea68e..78730247c0 100644
--- a/config/boards/lime-a64.conf
+++ b/config/boards/lime-a64.conf
@@ -5,3 +5,4 @@ BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="a64-olinuxino_defconfig"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
+PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
diff --git a/config/boards/orangepiwin.conf b/config/boards/orangepiwin.conf
index f647e64411..0c85f7dc44 100644
--- a/config/boards/orangepiwin.conf
+++ b/config/boards/orangepiwin.conf
@@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="orangepi_win_defconfig"
 KERNEL_TARGET="current,dev"
+PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf
index b17cb02248..4703b4687e 100644
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG="pine64_plus_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
diff --git a/config/boards/pinebook-a64.conf b/config/boards/pinebook-a64.conf
index 2aeed6d466..22f7ec0166 100644
--- a/config/boards/pinebook-a64.conf
+++ b/config/boards/pinebook-a64.conf
@@ -5,3 +5,4 @@ BOOTCONFIG="pinebook_defconfig"
 DESKTOP_AUTOLOGIN="no"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
+PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
diff --git a/config/boards/teres-a64.conf b/config/boards/teres-a64.conf
index 5ad0db5e99..53a2ce85c5 100644
--- a/config/boards/teres-a64.conf
+++ b/config/boards/teres-a64.conf
@@ -5,3 +5,4 @@ BOOTCONFIG="teres_i_defconfig"
 DESKTOP_AUTOLOGIN="no"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
+PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh
index fc8e878ab4..cb749f38fe 100644
--- a/lib/makeboarddeb.sh
+++ b/lib/makeboarddeb.sh
@@ -160,15 +160,15 @@ create_board_package()
 
 	EOF
 
-#	if [[ $RELEASE == bionic ]]; then
-#		cat <<-EOF >> "${destination}"/DEBIAN/postinst
-#		# temporally disable acceleration in Bionic due to broken mesa packages
-#		echo 'Section "Device"
-#			Identifier "Default Device"
-#			Option "AccelMethod" "none"
-#		EndSection' >> /etc/X11/xorg.conf.d/01-armbian-defaults.conf
-#		EOF
-#	fi
+	if [[ $RELEASE == bionic ]]; then
+		cat <<-EOF >> "${destination}"/DEBIAN/postinst
+		# temporally disable acceleration in Bionic due to broken mesa packages
+		echo 'Section "Device"
+		\tIdentifier \t"Default Device"
+		\tOption \t"AccelMethod" "none"
+		EndSection' >> /etc/X11/xorg.conf.d/01-armbian-defaults.conf
+		EOF
+	fi
 
 	# install bootscripts if they are not present. Fix upgrades from old images
 	if [[ $FORCE_BOOTSCRIPT_UPDATE == yes ]]; then