--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2395,16 +2395,21 @@ BRANCHES['mozilla-release']['postrelease
     # TODO - fennec
     "fennec": "",
 }
 BRANCHES['mozilla-release']['postrelease_bouncer_aliases_config'] = {
     "firefox": 'releases/bouncer_firefox_release.py',
     # TODO - fennec
     "fennec": "",
 }
+BRANCHES['mozilla-release']['postrelease_mark_as_shipped_config'] = {
+    "firefox": 'releases/postrelease_firefox_release.py',
+    # TODO - fennec
+    "fennec": "",
+}
 BRANCHES['mozilla-release']['updates_config'] = {
     "firefox": 'releases/updates_firefox_release.py',
     # TODO - fennec
     "fennec": "",
 }
 BRANCHES['mozilla-release']['beetmover_credentials'] = "/builds/release-s3.credentials"
 BRANCHES['mozilla-release']['stage_product'] = {
     'firefox': 'firefox',
@@ -2414,16 +2419,17 @@ BRANCHES['mozilla-release']['platforms']
 BRANCHES['mozilla-release']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-release']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-release']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-release']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
 # used by releasetasks
 BRANCHES['mozilla-release']['bouncer_enabled'] = True
 BRANCHES['mozilla-release']['postrelease_version_bump_enabled'] = True
 BRANCHES['mozilla-release']['postrelease_bouncer_aliases_enabled'] = True
+BRANCHES['mozilla-release']['postrelease_mark_as_shipped_enabled'] = True
 BRANCHES['mozilla-release']['uptake_monitoring_enabled'] = True
 BRANCHES['mozilla-release']['push_to_candidates_enabled'] = True
 BRANCHES['mozilla-release']['push_to_releases_automatic'] = False
 BRANCHES['mozilla-release']['beetmover_buckets'] = {
     "firefox": "net-mozaws-prod-delivery-firefox",
     # TODO - add fennec support
     # 'fennec': 'net-mozaws-prod-delivery-archive',
 }
@@ -2506,16 +2512,21 @@ BRANCHES['mozilla-beta']['postrelease_ve
     # TODO - fennec
     "fennec": "",
 }
 BRANCHES['mozilla-beta']['postrelease_bouncer_aliases_config'] = {
     "firefox": 'releases/bouncer_firefox_beta.py',
     # TODO - fennec
     "fennec": "",
 }
+BRANCHES['mozilla-beta']['postrelease_mark_as_shipped_config'] = {
+    "firefox": 'releases/postrelease_firefox_beta.py',
+    # TODO - fennec
+    "fennec": "",
+}
 BRANCHES['mozilla-beta']['updates_config'] = {
     "firefox": 'releases/updates_firefox_beta.py',
     # TODO - fennec
     "fennec": "",
 }
 BRANCHES['mozilla-beta']['beetmover_credentials'] = "/builds/release-s3.credentials"
 BRANCHES['mozilla-beta']['stage_product'] = {
     'firefox': 'firefox',
@@ -2527,16 +2538,17 @@ BRANCHES['mozilla-beta']['platforms']['m
 BRANCHES['mozilla-beta']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-beta']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
 # used by releasetasks
 BRANCHES['mozilla-beta']['bouncer_enabled'] = True
 BRANCHES['mozilla-beta']['updates_builder_enabled'] = True
 BRANCHES['mozilla-beta']['update_verify_enabled'] = True
 BRANCHES['mozilla-beta']['postrelease_version_bump_enabled'] = True
 BRANCHES['mozilla-beta']['postrelease_bouncer_aliases_enabled'] = True
+BRANCHES['mozilla-beta']['postrelease_mark_as_shipped_enabled'] = True
 BRANCHES['mozilla-beta']['uptake_monitoring_enabled'] = True
 BRANCHES['mozilla-beta']['push_to_candidates_enabled'] = True
 BRANCHES['mozilla-beta']['push_to_releases_automatic'] = True
 BRANCHES['mozilla-beta']['release_channel_mappings'] = [["^.*$", ["beta"]]]
 BRANCHES['mozilla-beta']['beetmover_buckets'] = {
     "firefox": "net-mozaws-prod-delivery-firefox",
     # TODO - add fennec support
     # 'fennec': 'net-mozaws-prod-delivery-archive',
@@ -2645,32 +2657,36 @@ BRANCHES['mozilla-esr45']['uptake_monito
     "firefox": 'releases/bouncer_firefox_esr.py',
 }
 BRANCHES['mozilla-esr45']['postrelease_version_bump_config'] = {
     "firefox": 'releases/postrelease_firefox_esr45.py',
 }
 BRANCHES['mozilla-esr45']['postrelease_bouncer_aliases_config'] = {
     "firefox": 'releases/bouncer_firefox_esr.py',
 }
+BRANCHES['mozilla-esr45']['postrelease_mark_as_shipped_config'] = {
+    "firefox": 'releases/postrelease_firefox_esr45.py',
+}
 BRANCHES['mozilla-esr45']['updates_config'] = {
     "firefox": 'releases/updates_firefox_esr45.py',
 }
 BRANCHES['mozilla-esr45']['beetmover_credentials'] = "/builds/release-s3.credentials"
 BRANCHES['mozilla-esr45']['stage_product'] = {
     'firefox': 'firefox',
 }
 BRANCHES['mozilla-esr45']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-esr45']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-esr45']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-esr45']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-esr45']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
 # used by releasetasks
 BRANCHES['mozilla-esr45']['bouncer_enabled'] = True
 BRANCHES['mozilla-esr45']['postrelease_version_bump_enabled'] = True
 BRANCHES['mozilla-esr45']['postrelease_bouncer_aliases_enabled'] = True
+BRANCHES['mozilla-esr45']['postrelease_mark_as_shipped_enabled'] = True
 BRANCHES['mozilla-esr45']['uptake_monitoring_enabled'] = True
 BRANCHES['mozilla-esr45']['push_to_candidates_enabled'] = True
 BRANCHES['mozilla-esr45']['push_to_releases_automatic'] = False
 BRANCHES['mozilla-esr45']['beetmover_buckets'] = {
     "firefox": "net-mozaws-prod-delivery-firefox",
 }
 BRANCHES['mozilla-esr45']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
 BRANCHES['mozilla-esr45']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
@@ -2858,17 +2874,17 @@ for name, branch in items_at_least(BRANC
         del branch['platforms'][platform]
 
 # Bug 1282849 - disable fennec debug builds and tests in buildbot
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 50):
     for platform in branch['platforms'].keys():
         if platform not in ['android-api-15-debug']:
             continue
         del branch['platforms'][platform]
-        
+
 #Bug 1282468 - disable buildbot asan builds on trunk
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 51):
     for platform in branch['platforms'].keys():
         if 'linux64-asan' in platform:
             del branch['platforms'][platform]
 
 # mozilla-central's gecko version
 mr_gecko_version = BRANCHES['mozilla-release']['gecko_version']

--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -195,16 +195,20 @@ PROJECT_BRANCHES = {
         'uptake_monitoring_enabled': True,
         'uptake_monitoring_config': {
             "firefox": 'releases/dev_bouncer_firefox_esr.py',
         },
         'postrelease_bouncer_aliases_enabled': True,
         'postrelease_bouncer_aliases_config': {
             "firefox": 'releases/dev_bouncer_firefox_esr.py',
         },
+        'postrelease_mark_as_shipped_enabled': True,
+        'postrelease_mark_as_shipped_config': {
+            "firefox": 'releases/dev_postrelease_firefox_esr45.py',
+        },
         'push_to_candidates_enabled': True,
         'updates_config': {
             "firefox": 'releases/dev_updates_firefox_esr45.py',
         },
         'beetmover_credentials': '/builds/dev-beetmover-s3.credentials',
         'beetmover_buckets': {
             'firefox': 'net-mozaws-stage-delivery-firefox',
         },