diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile
index 89dab22e652a0..7fc5d28c3ea9b 100644
--- a/net/adguardhome/Makefile
+++ b/net/adguardhome/Makefile
@@ -6,16 +6,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.57
+PKG_VERSION:=0.107.58
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=9df951486dab0e83485b596c0393f91d4ff2994de26101b43af8344efb7c1536
+PKG_HASH:=da6a52764090d8350d55bc14b957ec6afdee0bd21b34b010796e220bde5e9186
 PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt
+PKG_CPE_ID:=cpe:/a:adguard:adguardhome
 PKG_MAINTAINER:=Dobroslaw Kijowski <dobo90@gmail.com>
 
 PKG_BUILD_DEPENDS:=golang/host node/host
@@ -54,12 +55,10 @@ Free and open source, powerful network-wide ads and trackers blocking DNS server
 endef
 
 define Build/Compile
-	( \
-		pushd $(PKG_BUILD_DIR) ; \
-		make js-deps js-build ; \
-		popd ; \
-		$(call GoPackage/Build/Compile) ; \
-	)
+	pushd $(PKG_BUILD_DIR) && \
+	make js-deps js-build && \
+	popd && \
+	$(call GoPackage/Build/Compile)
 endef
 
 define Package/adguardhome/install
diff --git a/net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch b/net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch
new file mode 100644
index 0000000000000..935363b6a0a65
--- /dev/null
+++ b/net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch
@@ -0,0 +1,14 @@
+--- a/client/webpack.common.js
++++ b/client/webpack.common.js
+@@ -63,6 +63,11 @@ const config = {
+                     },
+                     {
+                         loader: 'postcss-loader',
++                        options: {
++                            postcssOptions: {
++                                config: false,
++                            },
++                        },
+                     },
+                 ],
+             },
diff --git a/net/adguardhome/test.sh b/net/adguardhome/test.sh
new file mode 100755
index 0000000000000..434da128262f7
--- /dev/null
+++ b/net/adguardhome/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+AdGuardHome --version 2>&1 | cut -d' ' -f4 | grep "${PKG_VERSION}"