diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index d1b85aadbe..b17abe830c 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -512,6 +512,12 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE
 	  Writes data collected to Carbon (Graphite's) storage API.
 	  http://graphite.wikidot.com/start
 
+config BR2_PACKAGE_COLLECTD_MQTT
+	bool "mqtt"
+	select BR2_PACKAGE_MOSQUITTO
+	help
+	  Sends metrics to and/or receives metrics from an MQTT broker.
+
 config BR2_PACKAGE_COLLECTD_NETWORK
 	bool "network"
 	help
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index d8b2576c90..97e2e98db8 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -72,6 +72,7 @@ COLLECTD_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \
 	$(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \
 	$(if $(BR2_PACKAGE_COLLECTD_MODBUS),--enable-modbus,--disable-modbus) \
+	$(if $(BR2_PACKAGE_COLLECTD_MQTT),--enable-mqtt,--disable-mqtt) \
 	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \
 	$(if $(BR2_PACKAGE_COLLECTD_NETLINK),--enable-netlink,--disable-netlink) \
 	$(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \
@@ -133,6 +134,7 @@ COLLECTD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \
 	$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \
 	$(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \
+	$(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \
 	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \
 	$(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \
 	$(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \