diff --git a/.gitignore b/.gitignore
index 6d2e9cd..adbab03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 ecbundle
+maestro-core
 source
 build
 install
diff --git a/build-maestro b/build-maestro
new file mode 100755
index 0000000..33a4b84
--- /dev/null
+++ b/build-maestro
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+rm -rf maestro-core
+git clone https://gitlab.com/maestro-data/maestro-core.git maestro-core
+cd maestro-core
+autoreconf -ivf
+./configure --prefix=${PWD}/install
+make -j8
+make install
+cd ..
+
diff --git a/bundle.yml b/bundle.yml
index 7c60cf2..750ad3a 100644
--- a/bundle.yml
+++ b/bundle.yml
@@ -78,6 +78,8 @@ projects :
         cmake   : >
             ENABLE_MULTIO_SERVER=ON
             ENABLE_LEGACY_IFSIO=ON
+            ENABLE_MAESTRO=ON
+            MAESTRO_PATH=../maestro-core/install
 
     - atlas-orca :
         git     : git@github.com:ecmwf/atlas-orca