diff --git a/package/Config.in b/package/Config.in
index adb86956..15de5b37 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1,3 +1,4 @@
 source "$BR2_EXTERNAL_INFIX_PATH/package/finit/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/ifupdown2/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/skeleton-init-finit/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/querierd/Config.in"
diff --git a/package/querierd/Config.in b/package/querierd/Config.in
new file mode 100644
index 00000000..ece64269
--- /dev/null
+++ b/package/querierd/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_QUERIERD
+	bool "querierd"
+	help
+	  A bridge helper daemon for sending multicast queries.
+
+	  https://github.com/westermo/querierd
diff --git a/package/querierd/querierd.conf b/package/querierd/querierd.conf
new file mode 100644
index 00000000..521fad48
--- /dev/null
+++ b/package/querierd/querierd.conf
@@ -0,0 +1,31 @@
+# /etc/querierd.conf: default Infix configuration
+
+# Query interval can be [1,1024], default 125.  Recommended not go below 10
+#query-interval 125
+
+# The interval inside the query-interval that clients should respond
+#query-response-interval 10
+
+# Last member query interval [1,1024], default 1.  The igmp-robustness
+# setting controls the last member query count.
+#query-last-member-interval 1
+
+# Querier's robustness can be [2,10], default 2.  Recommended to use 2
+#robustness 2
+
+# Controls the "other querier present interval", used to detect when an
+# elected querier stops sending queries.  Leave this commented-out, it
+# is only available to override particular use-cases and interip with
+# devices that do not follow the RFC.  When commented out, the timeout
+# is calculated from the query interval and robustness according to RFC.
+#router-timeout 255
+
+# IP Option Router Alert is enabled by default, for interop with stacks
+# that hard-code the length of the IP header
+#no router-alert
+
+# Enable and one of the IGMP versions to use at startup, with fallback
+# to older versions if older clients appear.
+iface vlan1 enable igmpv3
+#iface vlan2 enable igmpv3
+#iface vlan3 enable igmpv3
diff --git a/package/querierd/querierd.hash b/package/querierd/querierd.hash
new file mode 100644
index 00000000..43d20ec2
--- /dev/null
+++ b/package/querierd/querierd.hash
@@ -0,0 +1,2 @@
+sha256 c3e906866af73156d22d0f20b0754e5d09d6edc2e306b16d3e7b484736ff6e6e  querierd-0.9.tar.gz
+sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29  LICENSE
diff --git a/package/querierd/querierd.mk b/package/querierd/querierd.mk
new file mode 100644
index 00000000..b870a38d
--- /dev/null
+++ b/package/querierd/querierd.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# querierd
+#
+################################################################################
+
+QUERIERD_VERSION = 0.9
+QUERIERD_SITE    = \
+	https://github.com/westermo/querierd/releases/download/v$(QUERIERD_VERSION)
+QUERIERD_LICENSE = BSD-3-Clause
+QUERIERD_LICENSE_FILES = LICENSE
+QUERIERD_INSTALL_STAGING = YES
+
+define QUERIERD_INSTALL_CONFIG
+	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_INFIX_PATH)/package/querierd/querierd.conf \
+		$(TARGET_DIR)/etc/
+endef
+QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_CONFIG
+
+define QUERIERD_INSTALL_FINIT_SVC
+	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_INFIX_PATH)/package/querierd/querierd.svc \
+		$(FINIT_D)/available/querierd.conf
+	$(INSTALL) -d -m 0755 $(FINIT_D)/enabled
+	ln -sf ../available/querierd.conf $(FINIT_D)/enabled/querierd.conf
+endef
+
+QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_FINIT_SVC
+
+$(eval $(autotools-package))
diff --git a/package/querierd/querierd.svc b/package/querierd/querierd.svc
new file mode 100644
index 00000000..5ae250b7
--- /dev/null
+++ b/package/querierd/querierd.svc
@@ -0,0 +1,2 @@
+# Launch IGMP querier daemon
+service [2345789] env:-/etc/default/querierd /usr/sbin/querierd -sn $QUERIERD_ARGS -- IGMP querier daemon