diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index d8b10f8520..4a9f8bb0d8 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -82,6 +82,12 @@ config BR2_PACKAGE_QUAGGA_WATCHQUAGGA
 	help
 	  Build and install watchquagga, a zebra/protocol daemon supervisor.
 
+config BR2_PACKAGE_QUAGGA_VTYSH
+	bool "Build vtysh"
+	select BR2_PACKAGE_READLINE
+	help
+	  Build and install vtysh, a vty shell for Quagga.
+
 config BR2_PACKAGE_QUAGGA_SNMP
 	bool "SNMP support"
 	depends on BR2_USE_MMU # net-snmp
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 2c0a6a9901..756d6e0e18 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -32,4 +32,11 @@ QUAGGA_CONF_OPTS += --enable-snmp=agentx
 QUAGGA_DEPENDENCIES += netsnmp
 endif
 
+ifeq ($(BR2_PACKAGE_QUAGGA_VTYSH),y)
+QUAGGA_CONF_OPTS += --enable-vtysh
+QUAGGA_DEPENDENCIES += readline
+else
+QUAGGA_CONF_OPTS += --disable-vtysh
+endif
+
 $(eval $(autotools-package))