--- a/mobile/config-production-n900.py
+++ b/mobile/config-production-n900.py
@@ -57,16 +57,35 @@ BRANCHES = {
             'n900-qt': generate_platform(default_n900,
                 build_branch='mozilla-central-maemo5-qt',
                 talos_branch='mobile-qt',
                 nightly_multi=True,
                 nightly_unit=True, dep_unit=False,
                 nightly_talos=True, dep_talos=False),
         },
     },
+    'mozilla-2.1': {
+        'tinderbox_tree': 'Mobile2.0',
+        'graph_server': 'graphs.mozilla.org',
+        'tree_stable_timer': 2,
+        'platforms': {
+            'n900-gtk': generate_platform(default_n900,
+                build_branch='mozilla-2.1-maemo5-gtk',
+                talos_branch='mobile-2.0',
+                nightly_multi=True,
+                nightly_unit=True, dep_unit=True,
+                nightly_talos=True, dep_talos=True),
+            'n900-qt': generate_platform(default_n900,
+                build_branch='mozilla-2.1-maemo5-qt',
+                talos_branch='mobile-2.0-qt',
+                nightly_multi=True,
+                nightly_unit=True, dep_unit=False,
+                nightly_talos=True, dep_talos=False),
+        },
+    },
     'mozilla-1.9.2': {
         'tinderbox_tree': 'Mobile1.1',
         'graph_server': 'graphs.mozilla.org',
         'tree_stable_timer': 2,
         'platforms': {
             'n900-gtk': generate_platform(default_n900,
                 build_branch='mozilla-1.9.2-maemo5-gtk',
                 talos_branch='mobile-1.9.2',

--- a/mobile/config-staging-n900.py
+++ b/mobile/config-staging-n900.py
@@ -61,16 +61,35 @@ BRANCHES = {
             'n900-qt': generate_platform(default_n900,
                 build_branch='mozilla-central-maemo5-qt',
                 talos_branch='mobile-qt',
                 nightly_multi=True,
                 nightly_unit=True, dep_unit=False,
                 nightly_talos=True, dep_talos=False),
         },
     },
+    'mozilla-2.1': {
+        'tinderbox_tree': 'MobileTest',
+        'graph_server': 'graphs-stage.mozilla.org',
+        'tree_stable_timer': 0,
+        'platforms': {
+            'n900-gtk': generate_platform(default_n900,
+                build_branch='mozilla-2.1-maemo5-gtk',
+                talos_branch='mobile-2.0',
+                nightly_multi=True,
+                nightly_unit=True, dep_unit=True,
+                nightly_talos=True, dep_talos=True),
+            'n900-qt': generate_platform(default_n900,
+                build_branch='mozilla-2.1-maemo5-qt',
+                talos_branch='mobile-2.0-qt',
+                nightly_multi=True,
+                nightly_unit=True, dep_unit=False,
+                nightly_talos=True, dep_talos=False),
+        },
+    },
     'mozilla-1.9.2': {
         'tinderbox_tree': 'MobileTest',
         'graph_server': 'graphs-stage.mozilla.org',
         'tree_stable_timer': 0,
         'platforms': {
             'n900-gtk': generate_platform(default_n900,
                 build_branch='mozilla-1.9.2-maemo5-gtk',
                 talos_branch='mobile-1.9.2',