diff --git a/Makefile b/Makefile
index 979c264..e5005cc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ linux-rock64-package-$(RELEASE_NAME).deb: package
 		-p $@ \
 		--deb-priority optional --category admin \
 		--force \
+		--depends figlet \
 		--deb-compression bzip2 \
 		--after-install package/scripts/postinst.deb \
 		--before-remove package/scripts/prerm.deb \
diff --git a/package/root/etc/update-motd.d/05-figlet b/package/root/etc/update-motd.d/05-figlet
new file mode 100755
index 0000000..4749761
--- /dev/null
+++ b/package/root/etc/update-motd.d/05-figlet
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+figlet $(hostname)
diff --git a/package/root/etc/update-motd.d/11-rock64-help-text b/package/root/etc/update-motd.d/11-rock64-help-text
deleted file mode 100755
index 7b98206..0000000
--- a/package/root/etc/update-motd.d/11-rock64-help-text
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ $(id -u) -eq 0 ]; then
-    echo ""
-    echo "Update system with:"
-    echo ""
-    echo " * rock64_update_package.sh"
-fi
diff --git a/package/root/usr/local/sbin/rock64_update_package.sh b/package/root/usr/local/sbin/rock64_update_package.sh
deleted file mode 100755
index da3a77e..0000000
--- a/package/root/usr/local/sbin/rock64_update_package.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-VERSION="$1"
-
-if [ -z "$1" ]; then
-	VERSION=$(curl -s https://api.github.com/repos/ayufan-rock64/linux-build/releases/latest | jq -r ".tag_name")
-	if [ -z "$VERSION" ]; then
-		echo "Latest release was not found. Please go to: $LATEST_LIST"
-		exit 1
-	fi
-
-	echo "Using latest release: $VERSION."
-fi
-
-DEVICE="/dev/mmcblk0"
-URL="https://github.com/ayufan-rock64/linux-build/releases/download/$VERSION/linux-rock64-package-$VERSION.deb"
-
-if [ "$(id -u)" -ne "0" ]; then
-	echo "This script requires root."
-	exit 1
-fi
-
-TEMP=$(mktemp -d -p /var/tmp)
-
-cleanup() {
-	if [ -d "$TEMP" ]; then
-		rm -rf "$TEMP"
-	fi
-}
-trap cleanup EXIT INT
-
-echo "Checking for update ..."
-FILENAME=$TEMP/$(basename ${URL})
-
-if [ -z "$MARK_ONLY" ]; then
-	echo "Downloading model package ..."
-	curl -L "${URL}" -f --progress-bar --output "${FILENAME}"
-
-    echo "Installing model package ..."
-    sudo dpkg -i "${FILENAME}"
-
-	echo "Done - you should reboot now."
-else
-	echo "Mark only."
-fi
diff --git a/rootfs/make_rootfs.sh b/rootfs/make_rootfs.sh
index bf37dc8..356e421 100755
--- a/rootfs/make_rootfs.sh
+++ b/rootfs/make_rootfs.sh
@@ -157,7 +157,7 @@ locale-gen en_US.UTF-8
 apt-get -y update
 apt-get -y install dosfstools curl xz-utils iw rfkill wpasupplicant openssh-server alsa-utils \
 	nano git build-essential vim jq wget ca-certificates software-properties-common dirmngr \
-	gdisk parted
+	gdisk parted figlet
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BF428671
 if [[ "$DISTRO" == "jessie" ]]; then
 	REPO=xenial
@@ -166,6 +166,9 @@ elif [[ "$DISTRO" == "stretch" ]]; then
 else
 	REPO="$DISTRO"
 fi
+if [[ "$DISTRO" == "xenial" || "$DISTRO" == "zesty" ]]; then
+	apt-get -y install landscape-common
+fi
 add-apt-repository "deb http://ppa.launchpad.net/ayufan/rock64-ppa/ubuntu \$REPO main"
 curl -fsSL http://deb.ayufan.eu/orgs/ayufan-rock64/archive.key | apt-key add -
 apt-get update -y