diff --git a/package/haveged/Config.in b/package/haveged/Config.in
index 0e49a2db7c..8862792824 100644
--- a/package/haveged/Config.in
+++ b/package/haveged/Config.in
@@ -1,9 +1,14 @@
 config BR2_PACKAGE_HAVEGED
 	bool "haveged"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS # semaphore.h
 	help
 	  The haveged project is an attempt to provide an easy-to-use,
 	  unpredictable random number generator based upon an adaptation
 	  of the HAVEGE algorithm.
 
 	  http://www.issihosts.com/haveged/
+
+comment "haveged needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk
index e22712f016..bf3209cfdc 100644
--- a/package/haveged/haveged.mk
+++ b/package/haveged/haveged.mk
@@ -18,18 +18,13 @@ HAVEGED_CONF_OPTS = \
 	--disable-nistest \
 	--disable-enttest \
 	--disable-olt \
+	--enable-threads \
 	--enable-tune
 
 ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
 HAVEGED_CONF_OPTS += --enable-clock_gettime
 endif
 
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-HAVEGED_CONF_OPTS += --enable-threads
-else
-HAVEGED_CONF_OPTS += --disable-threads
-endif
-
 define HAVEGED_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/haveged/S21haveged \
 		$(TARGET_DIR)/etc/init.d/S21haveged