diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo
index c81ef0fb70..7cadb4429e 100755
--- a/packages/bsp/common/etc/init.d/armhwinfo
+++ b/packages/bsp/common/etc/init.d/armhwinfo
@@ -282,8 +282,14 @@ log_hardware_info() {
 	cat /proc/cpuinfo >>${Log}
 	echo -e "\n### meminfo:\n" >>${Log}
 	cat /proc/meminfo >>${Log}
-	echo -e "\n### ifconfig:\n" >>${Log}
-	ifconfig >>${Log}
+	if [ -x /sbin/ip ]; then
+		echo -e "\n### ip addr:\n" >>${Log}
+		ip addr >>${Log}
+		echo " " >>${Log}
+	else
+		echo -e "\n### ifconfig:\n" >>${Log}
+		ifconfig >>${Log}
+	fi
 	echo -e "### partitions:\n" >>${Log}
 	egrep -v " ram| zram" /proc/partitions >>${Log}
 	echo -e "\n### df:\n" >>${Log}
@@ -293,7 +299,7 @@ log_hardware_info() {
 	egrep '^/dev/|\ zfs\ ' /etc/mtab | egrep -v "log2ram|folder2ram" | sort >>${Log}
 	[[ -e /boot/script.bin ]] && echo -e "\n### /boot/script.bin --> $(readlink /boot/script.bin)" >>${Log}
 	get_flash_information >>${Log}
-	(sleep 30 && echo -e "\n### interrupts:\n$(cat /proc/interrupts)" >>${Log}) &
+	(echo -e "\n### Boot system health:\n" >>${Log} ; armbianmonitor -s | egrep "^Time|^[0-9]" >>${Log}) &
 } # log_hardware_info
 
 get_flash_information() {
diff --git a/packages/bsp/common/usr/bin/armbianmonitor b/packages/bsp/common/usr/bin/armbianmonitor
index 674d1705b7..12ff4a8bef 100755
--- a/packages/bsp/common/usr/bin/armbianmonitor
+++ b/packages/bsp/common/usr/bin/armbianmonitor
@@ -810,7 +810,7 @@ CollectSupportInfo() {
 		VERBOSE='-v'
 		which lshw >/dev/null 2>&1 && (echo -e "\n### lshw:" ; lshw -quiet -sanitize -numeric)
 	fi
-	lsusb >/dev/null 2>&1 && (echo -e "\n### lsusb:" ; lsusb ${VERBOSE} 2>/dev/null ; echo "" ; lsusb -t 2>/dev/null)
+	lsusb >/dev/null 2>&1 && (echo -e "\n### lsusb:\n" ; lsusb ${VERBOSE} 2>/dev/null ; echo "" ; lsusb -t 2>/dev/null)
 	lspci >/dev/null 2>&1 && (echo -e "\n### lspci:" ; lspci ${VERBOSE} 2>/dev/null)
 	[ -z $SUDO_USER ] || echo -e "\n### Group membership of $(groups $SUDO_USER)"
 	echo -e "\n### Installed packages:\n\n$(dpkg -l | egrep "openmediavault|armbian| linux-")"
@@ -824,6 +824,7 @@ CollectSupportInfo() {
 	[[ -f /var/log/nand-sata-install.log ]] && echo -e "\n### nand-sata-install.log:\n\n$(cat /var/log/nand-sata-install.log)"
 	echo -e "\n### Current system health:\n\n$("$0" -s | egrep "^Time|^[0-9]")"
 	echo -e "\n### Current sysinfo:\n\n$(iostat -p ALL | grep -v "^loop")\n\n$(vmstat -w)\n\n$(free -h)\n\n$(uptime)\n\n$(dmesg | tail -n 250)"
+	echo -e "\n### interrupts:\n$(cat /proc/interrupts)"
 	ls /tmp/armbianmonitor_checks_* >/dev/null 2>&1 || return
 	for file in /tmp/armbianmonitor_checks_* ; do
 		echo -e "\n### \c"
@@ -1085,4 +1086,3 @@ kickAllStatsDown() {
 }
 
 Main "$@"
-