diff --git a/infra/config/README.md b/infra/config/README.md
new file mode 100644
index 00000000..fa0bbc44
--- /dev/null
+++ b/infra/config/README.md
@@ -0,0 +1,6 @@
+Infrastructure location.
+
+This contains Commit Queue config for automatic testing of changes before they
+are committed.
+
+Initial set up bug: http://crbug.com/618641.
diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
new file mode 100644
index 00000000..2f8f547b
--- /dev/null
+++ b/infra/config/cq.cfg
@@ -0,0 +1,42 @@
+# See http://luci-config.appspot.com/schemas/projects/refs:cq.cfg for the
+# documentation of this file format.
+version: 1
+cq_name: "boringssl"
+git_repo_url: "https://boringssl.googlesource.com/boringssl"
+cq_status_url: "https://chromium-cq-status.appspot.com"
+gerrit {
+	cq_verified_label: "CQ-Verified"
+}
+verifiers {
+  try_job {
+    buckets {
+      name: "client.boringssl"
+
+			builders { name: "linux" }
+			builders { name: "linux32" }
+			builders { name: "linux32_rel" }
+			builders { name: "linux_clang_rel" }
+			builders { name: "linux_noasm_asan" }
+			builders { name: "linux_nothreads" }
+			builders { name: "linux_rel" }
+			builders { name: "linux_shared" }
+			builders { name: "linux_small" }
+
+			builders { name: "mac" }
+			builders { name: "mac_rel" }
+			builders { name: "mac_small" }
+
+			builders { name: "win32" }
+			builders { name: "win32_rel" }
+			builders { name: "win32_small" }
+			builders { name: "win64" }
+			builders { name: "win64_rel" }
+			builders { name: "win64_small" }
+
+			# TODO(tandrii): add Android builders once they are registered in
+			# cr-buildbucket.cfg.
+
+			builders { name: "docs" }
+    }
+  }
+}