diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 0834201d4d..c364ae1b4b 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -84,4 +84,7 @@ config BR2_PACKAGE_QUAGGA_SNMP
 	help
 	  Make quagga information available via SNMP SMUX.
 
+comment "AgentX support must be enabled in net-snmp or the build will break"
+	depends on BR2_PACKAGE_QUAGGA_SNMP
+
 endif
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 42f8506b24..347ec4ddb5 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -26,10 +26,8 @@ QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--d
 
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
 QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
-QUAGGA_CONF_OPT += --enable-snmp
+QUAGGA_CONF_OPT += --enable-snmp=agentx
 QUAGGA_DEPENDENCIES += netsnmp
-else
-QUAGGA_CONF_OPT +=--disable-snmp
 endif
 
 $(eval $(autotools-package))