diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
index 56f0badee..7ab04c6c7 100644
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@@ -169,6 +169,12 @@ makeinstall_target() {
 }
 
 post_install() {
+  ### This resolves a conflict with the bash package.
+  if [ "$(readlink ${INSTALL}/usr/bin/sh)" = "busybox" ]
+  then
+    rm -f ${INSTALL}/usr/bin/sh
+    ln -s bash ${INSTALL}/usr/bin/sh
+  fi
   ROOT_PWD="`$TOOLCHAIN/bin/cryptpw -m sha512 ${ROOT_PASSWORD}`"
 
   echo "chmod 4755 ${INSTALL}/usr/bin/busybox" >> $FAKEROOT_SCRIPT
diff --git a/packages/sysutils/busybox/profile.d/98-busybox.conf b/packages/sysutils/busybox/profile.d/98-busybox.conf
index bd93a25fa..17c05d418 100644
--- a/packages/sysutils/busybox/profile.d/98-busybox.conf
+++ b/packages/sysutils/busybox/profile.d/98-busybox.conf
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 
+. /etc/os-release
+
 export HOME="/storage"
 export PATH="/usr/bin:/usr/sbin"
 export LD_LIBRARY_PATH="/usr/lib"
 export HOSTNAME=`cat /etc/hostname`
-export PS1="\[\e[1;30m\]\w \[\e[0m\]\\$ "
+export PS1="\e[1;30m\]${HW_DEVICE}:\[\e[1;30m\]\w \[\e[0m\]\\$ "
 # k0p
 case "$TERM" in
   linux|nxterm|screen|xterm|xterm-color)