diff --git a/configuration.sh b/configuration.sh
index 8feb628c24..1b746448de 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -525,16 +525,18 @@ esac
 
 
 # Essential packages
-PACKAGE_LIST="alsa-utils automake btrfs-tools bash-completion bc bridge-utils bluez build-essential cmake cpufrequtils curl psmisc \
-	device-tree-compiler dosfstools evtest figlet fbset fping git haveged hddtemp hdparm hostapd htop i2c-tools ifenslave-2.6 \
-	iperf ir-keytable iotop iozone3 iw less libbluetooth-dev libbluetooth3 libtool libwrap0-dev libfuse2 libssl-dev lirc lsof makedev \
-	module-init-tools mtp-tools nano ntfs-3g ntp parted pkg-config pciutils pv python-smbus rfkill rsync screen stress sudo subversion \
-	sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools weather-util weather-util-data wget wpasupplicant \
-	iptables dvb-apps libdigest-sha-perl libproc-processtable-perl w-scan apt-transport-https sysbench libusb-dev dialog fake-hwclock \
+PACKAGE_LIST="alsa-utils automake bash-completion bc bridge-utils build-essential cmake cpufrequtils \
+	device-tree-compiler dosfstools figlet fbset fping git haveged hdparm hostapd ifenslave-2.6 psmisc \
+	iw less libtool libwrap0-dev libfuse2 libssl-dev lirc lsof makedev fake-hwclock wpasupplicant \
+	module-init-tools nano ntp parted pkg-config pv rfkill rsync sudo curl dialog \
+	sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools wget \
+	iptables libdigest-sha-perl libproc-processtable-perl w-scan libusb-dev \
 	console-setup console-data kbd console-common unicode-data openssh-server man-db"
 
 # Non-essential packages
-PACKAGE_LIST_ADDITIONAL=""
+PACKAGE_LIST_ADDITIONAL="btrfs-tools bluez hddtemp i2c-tools iperf ir-keytable iotop iozone3 weather-util weather-util-data stress \
+	dvb-apps sysbench libbluetooth-dev libbluetooth3 subversion screen ntfs-3g vim pciutils evtest htop mtp-tools python-smbus \
+	apt-transport-https"
 
 # Release specific packages
 case $RELEASE in
diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh
index cbbd2149a3..44c651c0d4 100644
--- a/debootstrap-ng.sh
+++ b/debootstrap-ng.sh
@@ -125,7 +125,7 @@ debootstrap_ng()
 create_rootfs_cache()
 {
 	[[ $BUILD_DESKTOP == yes ]] && local variant_desktop=yes
-	local packages_hash=$(md5sum <<< $PACKAGE_LIST | cut -d' ' -f 1)
+	local packages_hash=$(get_package_list_hash $PACKAGE_LIST)
 	local cache_fname="$DEST/cache/rootfs/$RELEASE${variant_desktop:+_desktop}-ng.$packages_hash.tgz"
 	if [[ -f $cache_fname ]]; then
 		local filemtime=$(stat -c %Y $cache_fname)
diff --git a/debootstrap.sh b/debootstrap.sh
index f4bc7f490d..976e3f1f1e 100644
--- a/debootstrap.sh
+++ b/debootstrap.sh
@@ -78,7 +78,7 @@ fi
 
 # rootfs cache file name
 [[ $BUILD_DESKTOP == yes ]] && local variant_desktop=yes
-local packages_hash=$(md5sum <<< $PACKAGE_LIST | cut -d' ' -f 1)
+local packages_hash=$(get_package_list_hash $PACKAGE_LIST)
 local cache_fname="$DEST/cache/rootfs/$RELEASE${variant_desktop:+_desktop}.$packages_hash.tgz"
 
 # Uncompress from cache
diff --git a/general.sh b/general.sh
index 8bea1111b6..4e21736324 100644
--- a/general.sh
+++ b/general.sh
@@ -11,6 +11,7 @@
 
 # Functions:
 # cleaning
+# get_package_list_hash
 # fetch_from_github
 # display_alert
 # check_error
@@ -59,6 +60,16 @@ cleaning()
 	esac
 }
 
+# get_package_list_hash <package_list>
+#
+# outputs md5hash for space-separated <package_list>
+# for rootfs cache
+
+get_package_list_hash()
+{
+	echo $(printf '%s\n' $PACKAGE_LIST | sort -u | md5sum | cut -d' ' -f 1)
+}
+
 # fetch_from_github <URL> <directory> <tag> <tagsintosubdir>
 #
 # parameters: