diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 4aa6c528..228f62be 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -209,6 +209,7 @@ menu "Mycroft A.I. Skills"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-pairing/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-volume/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-parrot/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-query/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-weather/Config.in"
 endmenu
 endmenu
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 92b0577c..58c47e0b 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -620,4 +620,5 @@ BR2_PACKAGE_MYCROFT_SKILL_OVOS_MYCROFTGUI=y
 BR2_PACKAGE_MYCROFT_SKILL_OVOS_PAIRING=y
 BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y
 BR2_PACKAGE_MYCROFT_SKILL_PARROT=y
+BR2_PACKAGE_MYCROFT_SKILL_QUERY=y
 BR2_PACKAGE_MYCROFT_SKILL_WEATHER=y
diff --git a/buildroot-external/package/mycroft-skill-query/Config.in b/buildroot-external/package/mycroft-skill-query/Config.in
new file mode 100644
index 00000000..ae9c2002
--- /dev/null
+++ b/buildroot-external/package/mycroft-skill-query/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MYCROFT_SKILL_QUERY
+	bool "mycroft-skill-query"
+	help
+	  Skill Negotiating for the best source for 
+	  an answer via Common QA
+
+	  https://github.com/MycroftAI/skill-query
diff --git a/buildroot-external/package/mycroft-skill-query/mycroft-skill-query.mk b/buildroot-external/package/mycroft-skill-query/mycroft-skill-query.mk
new file mode 100644
index 00000000..990ced38
--- /dev/null
+++ b/buildroot-external/package/mycroft-skill-query/mycroft-skill-query.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# mycroft-skill-query
+#
+################################################################################
+
+MYCROFT_SKILL_QUERY_VERSION = 8789731b6f0ba387039596fa64817549f12c35f5
+MYCROFT_SKILL_QUERY_SITE = git://github.com/MycroftAI/skill-query
+MYCROFT_SKILL_QUERY_SITE_METHOD = git
+MYCROFT_SKILL_QUERY_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
+MYCROFT_SKILL_QUERY_DIRNAME = skill-query.mycroftai
+
+define MYCROFT_SKILL_QUERY_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_QUERY_DIRNAME)
+	cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_QUERY_DIRNAME)
+	cp -dpfr $(MYCROFT_SKILL_QUERY_DL_DIR)/git/.git* \
+		$(TARGET_DIR)/$(MYCROFT_SKILL_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_QUERY_DIRNAME)
+endef
+
+$(eval $(generic-package))