diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index fa31a43e..d0a8d5ad 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -9,8 +9,16 @@ WPA_SUPPLICANT_DIR = wpa_supplicant-$(WPA_SUPPLICANT_VERSION)
 WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VERSION).tar.gz
 WPA_SUPPLICANT_SITE = https://w1.fi/releases
 
+WPA_SUPPLICANT_SUBDIR = wpa_supplicant
+
 WPA_SUPPLICANT_DEPENDENCIES = openssl
 
+WPA_SUPPLICANT_MAKE_ENV = \
+	$(TARGET_CONFIGURE_ENV)
+
+WPA_SUPPLICANT_MAKE_INSTALL_OPTS = \
+	BINDIR=$(sbindir)
+
 ifeq ($(BOXTYPE),coolstream)
 WPA_SUPPLICANT_CONFIG = $(PKG_FILES_DIR)/wpa_supplicant.config-$(WPA_SUPPLICANT_VERSION)
 else
@@ -19,7 +27,7 @@ WPA_SUPPLICANT_DEPENDENCIES += libnl
 endif
 
 define WPA_SUPPLICANT_INSTALL_CONFIG
-	$(INSTALL_DATA) $(WPA_SUPPLICANT_CONFIG) $(PKG_BUILD_DIR)/wpa_supplicant/.config
+	$(INSTALL_DATA) $(WPA_SUPPLICANT_CONFIG) $(PKG_BUILD_DIR)/.config
 endef
 WPA_SUPPLICANT_POST_PATCH_HOOKS += WPA_SUPPLICANT_INSTALL_CONFIG
 
@@ -38,9 +46,4 @@ WPA_SUPPLICANT_TARGET_FINALIZE_HOOKS += WPA_SUPPLICANT_INSTALL_LINK
 endif
 
 wpa_supplicant: | $(TARGET_DIR)
-	$(call PREPARE)
-	$(CHDIR)/$($(PKG)_DIR)/wpa_supplicant; \
-		$(TARGET_CONFIGURE_ENV) \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=$(sbindir)
-	$(call TARGET_FOLLOWUP)
+	$(call generic-package)