--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -120,19 +120,23 @@ class ArtifactJob(object):
         ('bin/xpcshell', ('bin', 'bin')),
         ('bin/plugins/*', ('bin/plugins', 'plugins'))
     }
 
     # We can tell our input is a test archive by this suffix, which happens to
     # be the same across platforms.
     _test_archive_suffix = '.common.tests.zip'
 
-    def __init__(self, package_re=None, tests_re=None, log=None):
+    def __init__(self, binary_artifacts_re=None, package_re=None, tests_re=None,
+                 log=None):
+        self._binary_artifacts_re = None
         self._package_re = None
         self._tests_re = None
+        if binary_artifacts_re:
+            self._binary_artifacts_re = re.compile(binary_artifacts_re)
         if package_re:
             self._package_re = re.compile(package_re)
         if tests_re:
             self._tests_re = re.compile(tests_re)
         self._log = log
 
     def log(self, *args, **kwargs):
         if self._log:
@@ -400,16 +404,17 @@ JOB_DETAILS = {
         'tests_re': 'public/build/firefox-(.*)\.common\.tests\.zip'}),
     'linux64': (LinuxArtifactJob, {
         'package_re': 'public/build/firefox-(.*)\.linux-x86_64\.tar\.bz2',
         'tests_re': 'public/build/firefox-(.*)\.common\.tests\.zip'}),
     'linux64-debug': (LinuxArtifactJob, {
         'package_re': 'public/build/firefox-(.*)\.linux-x86_64\.tar\.bz2',
         'tests_re': 'public/build/firefox-(.*)\.common\.tests\.zip'}),
     'macosx64': (MacArtifactJob, {
+        'binary_artifacts_re': 'public/build/firefox-(.*)\.binary-artifacts.zip',
         'package_re': 'public/build/firefox-(.*)\.mac\.dmg',
         'tests_re': 'public/build/firefox-(.*)\.common\.tests\.zip'}),
     'macosx64-debug': (MacArtifactJob, {
         'package_re': 'public/build/firefox-(.*)\.mac64\.dmg',
         'tests_re': 'public/build/firefox-(.*)\.common\.tests\.zip'}),
     'win32': (WinArtifactJob, {
         'package_re': 'public/build/firefox-(.*)\.win32.zip',
         'tests_re': 'public/build/firefox-(.*)\.common\.tests\.zip'}),