diff --git a/.gitignore b/.gitignore
index af38e5e..0e3963a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,8 @@ dist/
 releasenotes/build
 /.stestr/
 /*.db
+
+# Files created when queries are run
+*.rpt*
+*.dat
+*.txt
diff --git a/queries/ocata-em/ocata-em.qry b/queries/ocata-em/ocata-em.qry
new file mode 100644
index 0000000..e565888
--- /dev/null
+++ b/queries/ocata-em/ocata-em.qry
@@ -0,0 +1 @@
+after:2018-08-30 branch:stable/ocata ( is:merged OR is:open )
\ No newline at end of file
diff --git a/queries/ocata-em/run_contributor_report.sh b/queries/ocata-em/run_contributor_report.sh
new file mode 100755
index 0000000..7e5db2b
--- /dev/null
+++ b/queries/ocata-em/run_contributor_report.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -xe
+
+if [ ! -f .tox/venv/bin/activate ]; then
+    tox -e venv --notest
+fi
+source .tox/venv/bin/activate
+
+for input in queries/ocata-em/ocata-em.qry
+do
+    txt_file=${input%.qry}.txt
+    dat_file=${input%.qry}.dat
+    rpt_file=${input%.qry}.rpt
+
+    # Text report
+    who-helped --debug contributions summarize $dat_file \
+        | tee $rpt_file
+
+    # Text report, by team
+    who-helped --debug contributions summarize --by Team $dat_file \
+        | tee ${input%.qry}.teams.rpt
+
+    # Text report, by team, without deployment tools
+    who-helped --debug contributions summarize --by Team \
+               --ignore-team OpenStackAnsible \
+               --ignore-team 'Puppet OpenStack' \
+               --ignore-team 'Chef OpenStack' \
+               --ignore-team 'tripleo' \
+               --ignore-team 'kolla' \
+               $dat_file \
+        | tee ${input%.qry}.service-teams.rpt
+
+    # Text report summarizing people per org
+    who-helped contributions summarize \
+               --count Name --ignore-single-vendor $dat_file \
+        | tee $rpt_file.people.csv
+done