diff --git a/.gitmodules b/.gitmodules
index 80b3fdb68..2a931e564 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -81,3 +81,7 @@
   path = parm/jcb-algorithms
   url = https://github.com/noaa-emc/jcb-algorithms
   branch = develop
+[submodule "sorc/bufr-query"]
+  path = sorc/bufr-query
+  url = https://github.com/noaa-emc/bufr-query.git
+  branch = develop
diff --git a/build.sh b/build.sh
index 06efa7595..801f3c8bc 100755
--- a/build.sh
+++ b/build.sh
@@ -126,7 +126,7 @@ set -x
 if [[ $BUILD_JCSDA == 'YES' ]]; then
   make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
 else
-  builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils"
+  builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils bufr-query"
   for b in $builddirs; do
     cd $b
     make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
index 7481aa95e..c7282f6c2 100644
--- a/bundle/CMakeLists.txt
+++ b/bundle/CMakeLists.txt
@@ -88,6 +88,9 @@ if(BUILD_GDASBUNDLE)
 # Gibbs seawater
   ecbuild_bundle( PROJECT gsw SOURCE "../sorc/gsw" )
 
+# EMC BUFR-query library
+  ecbuild_bundle( PROJECT bufr-query SOURCE "../sorc/bufr-query" )
+
 # Core JEDI repositories
   ecbuild_bundle( PROJECT oops SOURCE "../sorc/oops" )
   ecbuild_bundle( PROJECT vader SOURCE "../sorc/vader" )
diff --git a/sorc/bufr-query b/sorc/bufr-query
new file mode 160000
index 000000000..97367fcd5
--- /dev/null
+++ b/sorc/bufr-query
@@ -0,0 +1 @@
+Subproject commit 97367fcd59adf4863aba1a52189e20f9f66451af