--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -59,16 +59,18 @@ GLOBAL_VARS.update({
         'dolphin_eng': {},
         'dolphin-512': {},
         'dolphin-512_eng': {},
 
         # Graphene builds. These are a different app (ie, not B2G) and would
         # have their own config files in an ideal world, but it's not worth
         # the effort at this point.
         'linux64_graphene': {},
+        'macosx64_graphene': {},
+        'win64_graphene': {},
     },
     'enable_nightly': True,
     'enable_l10n': False,
     'enable_xulrunner': False,
     'enabled_products': ['b2g', 'graphene'],
     'product_prefix': 'b2g',
     'unittest_suites': [],
     # XXX: this seems like it should be at the platform level
@@ -1628,21 +1630,60 @@ PLATFORM_VARS = {
             "script_name": "scripts/fx_desktop_build.py",
             "extra_args": [
                 "--config", "builds/releng_base_linux_64_builds.py",
                 "--custom-build-variant-cfg", "graphene"
             ],
             "script_timeout": 3 * 3600,
             "script_maxtime": int(5.5 * 3600),
         },
-        "stage_product": "graphene",
+        "stage_product": "b2g",
         "base_name": "graphene_%(branch)s_linux64",
         "platform_objdir": OBJDIR,
         "slaves": SLAVES["mock"],
     },
+    "macosx64_graphene": {
+        "mozharness_python": "/tools/buildbot/bin/python",
+        "reboot_command": ["scripts/external_tools/count_and_reboot.py",
+                           "-f", "../reboot_count.txt", "-n", "1", "-z"],
+        "mozharness_desktop_build": {
+            "script_name": "scripts/fx_desktop_build.py",
+            "extra_args": [
+                "--config", "builds/releng_base_mac_64_builds.py",
+                "--custom-build-variant-cfg", "graphene"
+            ],
+            "script_timeout": 3 * 3600,
+            "script_maxtime": int(5.5 * 3600),
+        },
+        "stage_product": "b2g",
+        "base_name": "graphene_%(branch)s_macosx64",
+        "platform_objdir": OBJDIR,
+        "slaves": SLAVES["macosx64-lion"],
+    },
+    "win64_graphene": {
+        "mozharness_python": ["c:/mozilla-build/python27/python", "-u"],
+        "reboot_command": [
+            "c:/mozilla-build/python27/python", "-u",
+            "scripts/external_tools/count_and_reboot.py",
+            "-f", "../reboot_count.txt","-n", "1", "-z"
+        ],
+        "mozharness_desktop_build": {
+            "script_name": "scripts/fx_desktop_build.py",
+            "extra_args": [
+                "--config", "builds/releng_base_win_64_builds.py",
+                "--custom-build-variant-cfg", "graphene"
+            ],
+            "script_timeout": 3 * 3600,
+            "script_maxtime": int(5.5 * 3600),
+        },
+        "stage_product": "b2g",
+        "base_name": "graphene_%(branch)s_win64",
+        "platform_objdir": OBJDIR,
+        "slaves": SLAVES["win64-rev2"],
+    },
 }
 
 for platform in PLATFORM_VARS.values():
     if 'env' not in platform:
         platform['env'] = deepcopy(GLOBAL_ENV)
     else:
         platform['env'].update((k, v) for k, v in GLOBAL_ENV.items() if k not in platform['env'])
 
@@ -1994,16 +2035,20 @@ BRANCHES['try']['platforms']['emulator-l
 BRANCHES['try']['platforms']['emulator-l-debug']['enable_dep'] = True
 BRANCHES['try']['platforms']['emulator-l-debug']['enable_periodic'] = False
 
 # Graphene is only enabled on Larch for now.
 for name, branch in BRANCHES.iteritems():
     if name != "larch":
         if "linux64_graphene" in branch["platforms"]:
             del branch["platforms"]["linux64_graphene"]
+        if "macosx64_graphene" in branch["platforms"]:
+            del branch["platforms"]["macosx64_graphene"]
+        if "win64_graphene" in branch["platforms"]:
+            del branch["platforms"]["win64_graphene"]
 
 # Mulet landed in gecko 34
 for name, branch in items_before(BRANCHES, 'gecko_version', 34):
     if 'linux64-mulet' in branch['platforms']:
         del branch['platforms']['linux64-mulet']
 
 # Enable win32/macosx64 mulet in gecko 36+
 for name, branch in items_before(BRANCHES, 'gecko_version', 36):

--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -111,19 +111,17 @@ PROJECT_BRANCHES = {
     },
     # disabled by bug 1134508
     # 'gum': {},
     # disabled for bug 985718
     #'holly': {},
     'jamun': {},
     'larch': {
         "desktop_mozharness_builds_enabled": True,
-        "platforms": {
-            "linux64_graphene": {},
-        },
+        'enable_nightly': True,
     },
     'maple': {},
     # Customizations for integration work for bugs 481815 and 307181
     'oak': {
         'enable_nightly': True
     },
     'pine': {}
 }