diff --git a/package/Makefile b/package/Makefile
index 09df4fe2b..cae460933 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -69,7 +69,7 @@ package-$(BR2_COMPILE_GSM) += gsm
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HEYU) += heyu
 package-$(BR2_PACKAGE_HOSTAP_UTILS) += hostap-utils
-package-$(BR2_PACKAGE_HOSTAPD) += hostapd
+package-$(BR2_COMPILE_HOSTAPD) += hostapd
 package-$(BR2_COMPILE_HOWL) += howl
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_HTTPING) += httping
diff --git a/package/depend.mk b/package/depend.mk
index f973391c8..6ed55179b 100644
--- a/package/depend.mk
+++ b/package/depend.mk
@@ -29,7 +29,6 @@ iptables-snmp-compile: net-snmp-compile
 iptraf-compile: ncurses-compile
 ipsec-tools-compile: openssl-compile
 jamvm-compile: libffi-sable-compile zlib-compile sablevm-classpath-compile
-hostapd-compile: openssl-compile wireless-tools-compile
 httping-compile: openssl-compile
 kismet-compile: uclibc++-compile libpcap-compile ncurses-compile
 l2tpns-compile: libcli-compile
@@ -138,6 +137,11 @@ ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
 freeradius-compile: postgresql-compile
 endif
 
+hostapd-compile: wireless-tools-compile
+ifneq ($(BR2_PACKAGE_HOSTAPD),)
+hostapd-compile: openssl-compile
+endif
+
 ifneq ($(BR2_PACKAGE_MINI_HTTPD_MATRIXSSL),)
 mini_httpd-compile: matrixssl-compile
 endif