diff --git a/lib/compilation.sh b/lib/compilation.sh
index ca0c94b40..3aacbad71 100644
--- a/lib/compilation.sh
+++ b/lib/compilation.sh
@@ -637,6 +637,8 @@ compile_armbian-config()
 	display_alert "Building deb" "armbian-config" "info"
 
 	fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master"
+	fetch_from_repo "https://github.com/dylanaraps/neofetch" "neofetch" "tag:7.1.0"
+	fetch_from_repo "https://github.com/complexorganizations/wireguard-manager" "wireguard-manager" "tag:1.0.11"
 
 	mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/}
 
@@ -646,8 +648,8 @@ compile_armbian-config()
 	Version: $REVISION
 	Architecture: all
 	Maintainer: $MAINTAINER <$MAINTAINERMAIL>
-	Replaces: armbian-bsp
-	Depends: bash, iperf3, psmisc, curl, bc, expect, dialog, pv, \
+	Replaces: armbian-bsp, neofetch
+	Depends: bash, iperf3, psmisc, curl, bc, expect, dialog, pv, zip, \
 	debconf-utils, unzip, build-essential, html2text, apt-transport-https, html2text, dirmngr, software-properties-common, debconf, jq
 	Recommends: armbian-bsp
 	Suggests: libpam-google-authenticator, qrencode, network-manager, sunxi-tools
@@ -656,6 +658,11 @@ compile_armbian-config()
 	Description: Armbian configuration utility
 	END
 
+	install -m 755 "${SRC}"/cache/sources/neofetch/neofetch "${tmp_dir}/${armbian_config_dir}"/usr/bin/neofetch
+	cd "${tmp_dir}/${armbian_config_dir}"/usr/bin/
+	process_patch_file "${SRC}/patch/misc/add-armbian-neofetch.patch" "applying"
+
+	install -m 755 "${SRC}"/cache/sources/wireguard-manager/wireguard-manager.sh "${tmp_dir}/${armbian_config_dir}"/usr/bin/wireguard-manager
 	install -m 755 "${SRC}"/cache/sources/armbian-config/scripts/tv_grab_file "${tmp_dir}/${armbian_config_dir}"/usr/bin/tv_grab_file
 	install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmp_dir}/${armbian_config_dir}"/usr/sbin/armbian-config
 	install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-jobs "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/jobs.sh
diff --git a/patch/misc/add-armbian-neofetch.patch b/patch/misc/add-armbian-neofetch.patch
new file mode 100644
index 000000000..4207bc151
--- /dev/null
+++ b/patch/misc/add-armbian-neofetch.patch
@@ -0,0 +1,44 @@
+diff --git a/neofetch b/neofetch
+index 1e4b564..f59eca6 100755
+--- a/neofetch
++++ b/neofetch
+@@ -967,6 +967,10 @@ get_distro() {
+                     *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)"
+                 esac
+ 
++            elif [[ -f /etc/armbian-release ]]; then
++                       . /etc/armbian-release
++                       distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)"
++
+             elif [[ -f /etc/siduction-version ]]; then
+                 case $distro_shorthand in
+                     on|tiny) distro=Siduction ;;
+@@ -5336,6 +5340,28 @@ ${c1}
+ EOF
+         ;;
+ 
++        "Armbian"*)
++            set_colors 1 1
++            read -rd '' ascii_data <<'EOF'
++   ${c1}
++
++      █ █ █ █ █ █ █ █ █ █ █
++     ███████████████████████
++   ▄▄██                   ██▄▄
++   ▄▄██    ███████████    ██▄▄
++   ▄▄██   ██         ██   ██▄▄
++   ▄▄██   ██         ██   ██▄▄
++   ▄▄██   ██         ██   ██▄▄
++   ▄▄██   █████████████   ██▄▄
++   ▄▄██   ██         ██   ██▄▄
++   ▄▄██   ██         ██   ██▄▄
++   ▄▄██   ██         ██   ██▄▄
++   ▄▄██                   ██▄▄
++     ███████████████████████
++      █ █ █ █ █ █ █ █ █ █ █
++EOF
++        ;;
++
+         "alpine_small")
+             set_colors 4 7
+             read -rd '' ascii_data <<'EOF'