diff --git a/emilyshaffer/cla-signers/README.md b/emilyshaffer/cla-signers/README.md
new file mode 100644
index 0000000..3804cf5
--- /dev/null
+++ b/emilyshaffer/cla-signers/README.md
@@ -0,0 +1,9 @@
+# Greppable CLA signer list
+
+This file is intended for maintainers to use when checking whether committers
+have signed the obligatory CLA.
+
+To update the list, add new names to cla-signers and then run update-cla.sh.
+Before running the script, make sure the header (modify date) is still the first
+line in the file. update-cla will sort and dedupe the names and update the
+timestamp.
diff --git a/emilyshaffer/cla-signers/cla-signers b/emilyshaffer/cla-signers/cla-signers
new file mode 100644
index 0000000..fa20889
--- /dev/null
+++ b/emilyshaffer/cla-signers/cla-signers
@@ -0,0 +1,89 @@
+Updated Wed Apr 4 14:41:19 PDT 2018
+Aditya Saripalli
+Adriana Kobylak
+Alistair Popple
+Amithash Prasad
+Andres Oportus
+Andrew Geissler
+Andrew Jeffery
+Andy Mao
+Ben Wei
+Brad Bishop
+Brandon Wyman
+Camvan Nguyen
+Cedric Le Goater
+Cezary Golder
+Charles Hofer
+Cheng C Yang
+Chris Austen
+Chris Bostic
+David J Cobbley
+Dawid Frycki
+Deepak Kodihalli
+Dhruvaraj Subhashchandran
+Ed Tanous
+Edward James
+Emily Shaffer
+George Keishing
+Gunnar Mills
+Haiyue Wang
+Hariharasubramanian Ramasubramanian
+Harry (Hu) Li (CLA Manager)
+Iftekharul Islam
+Ivan Mikhaylov
+Jae Hyun Yoo
+James Feist
+James Mihm (CLA Manager)
+Jayanth Othayoth
+Jayashankar Padath
+Jeremy Kerr
+Joel Stanley
+Kamil Majcher
+Kasper Wszolek
+Kuiying Wang
+Kun Yi
+Lakshminarayana R Kammath
+Lei Yu
+Leonard Low
+Lukasz Golawski
+ManojKiran Eda
+Marri Devender Rao
+Matthew Barth
+Matthew Spinler
+Maury Zipse
+Michael Lim
+Milton Miller
+Nagaraju Goruganti 
+Nancy Yuen
+Naveen Rathi
+Norman James
+Patrick Venture
+Pawel Rapkiewicz
+Peter Hanson
+Rahul Maheshwari
+Ratan Gupta
+Ravindra Rao
+Reed Frandsen
+Richard Marian Thomaiyar
+Robert Lippert
+Sai Dasari (CLA Manager)
+Sam Mendoza-Jonas
+Saqib Khan
+Sathyajith Sanjeevaraya
+Sherad Khetan (CLA Manager)
+Sivas SRR 
+Sridevi Ramesh
+Stephanie Swanson
+Steven Sombar
+Sunil Mamillapalli
+Suraj Jitindar Singh
+Sweta Potthuri
+Tom Joseph
+Vernon Mauery
+Wiktor Golgowski
+William Kennington
+Yi Li
+Yiqian Yan
+Yong B Li
+Yuan Li
+Yunyun Lin
diff --git a/emilyshaffer/cla-signers/update-cla.sh b/emilyshaffer/cla-signers/update-cla.sh
new file mode 100755
index 0000000..c36e878
--- /dev/null
+++ b/emilyshaffer/cla-signers/update-cla.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Sort the names in the CLA (discarding the header)
+cat cla-signers | tail -n +2 | sort -u > cla-signers.new
+# Add a new header with fresh timestamp (discarding old file)
+echo Updated $(date) > cla-signers
+# Add sorted names below header
+cat cla-signers.new >> cla-signers
+# Remove temporary file
+rm cla-signers.new