diff --git a/mozilla/tools/buildbot-configs/tryserver/master.cfg b/mozilla/tools/buildbot-configs/tryserver/master.cfg
index 7e624eae676..7441fdbcfac 100644
--- a/mozilla/tools/buildbot-configs/tryserver/master.cfg
+++ b/mozilla/tools/buildbot-configs/tryserver/master.cfg
@@ -8,12 +8,12 @@
 # dictionary has a variety of keys to control different aspects of the
 # buildmaster. They are documented in docs/config.xhtml .
 
-import buildbotcustom.env
+import buildbotcustom.tryserver.env
 import buildbotcustom.tryserver.steps
-reload(buildbotcustom.env)
+reload(buildbotcustom.tryserver.env)
 reload(buildbotcustom.tryserver.steps)
 
-from buildbotcustom.env import MozillaEnvironments
+from buildbotcustom.tryserver.env import MozillaEnvironments
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
@@ -321,12 +321,12 @@ firefox_sendchange_win32_steps = [
                     workdir=".",
                     haltOnFailure=False,
                     flunkOnFailure=False,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="dump env vars",
                     workdir=".",
                     command="set | sort",
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(MozillaClientMk, cvsroot=CVSROOT),
 
@@ -340,7 +340,7 @@ firefox_sendchange_win32_steps = [
                     workdir="mozilla",
                     haltOnFailure=True,
                     flunkOnFailure=True,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(MozillaPatchDownload, patchDir="patches/",
                             haltOnFailure=True,
@@ -353,7 +353,7 @@ firefox_sendchange_win32_steps = [
     s(ShellCommand, name="mozconfig contents",
                     command=["cat",".mozconfig"],
                     workdir="mozilla",
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="building",
                     description=["building"],
@@ -363,7 +363,7 @@ firefox_sendchange_win32_steps = [
                     haltOnFailure=True,
                     flunkOnFailure=True,
                     timeout=3600,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="packaging (zip)",
                     description=["creating package"],
@@ -375,7 +375,7 @@ firefox_sendchange_win32_steps = [
                     workdir="mozilla/%s" % OBJDIR,
                     haltOnFailure=False,
                     flunkOnFailure=False,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="chmod package (zip)",
                     command=["chmod", "666",
@@ -412,7 +412,7 @@ firefox_sendchange_win32_steps = [
                     workdir="mozilla/%s" % OBJDIR,
                     haltOnFailure=False,
                     flunkOnFailure=False,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="chmod package (exe)",
                     command=["chmod", "666",
@@ -432,6 +432,22 @@ firefox_sendchange_win32_steps = [
                 haltOnFailure=False,
                 flunkOnFailure=False,
                 workdir="."),
+
+    s(ShellCommand,
+                name="build symbols",
+                command=["make", "-C", OBJDIR, "buildsymbols"],
+                haltOnFailure=True,
+                flunkOnFailure=False,
+                env=MozillaEnvironments['tryserver'],
+                workdir="."),
+
+     s(ShellCommand,
+                name="upload symbols",
+                command=["make", "-C", OBJDIR, "uploadsymbols"],
+                haltOnFailure=True,
+                flunkOnFailure=False,
+                env=MozillaEnvironments['tryserver'],
+                workdir=".")
 ]
 
 firefox_sendchange_win32_builder = {
@@ -623,12 +639,12 @@ firefox_sendchange_hg_win32_steps = [
                     haltOnFailure=True,
                     flunkOnFailure=True,
                     workdir=".",
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="dump env vars",
                     workdir=".",
                     command="set | sort",
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(MozillaTryServerHgClone,
                     workdir="mozilla/",
@@ -644,7 +660,7 @@ firefox_sendchange_hg_win32_steps = [
     s(ShellCommand, name="mozconfig contents",
                     command=["cat", ".mozconfig"],
                     workdir="mozilla",
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="building",
                     description=["building"],
@@ -654,7 +670,7 @@ firefox_sendchange_hg_win32_steps = [
                     flunkOnFailure=True,
                     workdir="mozilla",
                     timeout=3600,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="packaging (zip)",
                     description=["creating package"],
@@ -666,7 +682,7 @@ firefox_sendchange_hg_win32_steps = [
                     workdir="mozilla/%s" % OBJDIR,
                     haltOnFailure=False,
                     flunkOnFailure=False,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="chmod package (zip)",
                     command=["chmod", "666",
@@ -703,7 +719,7 @@ firefox_sendchange_hg_win32_steps = [
                     workdir="mozilla/%s" % OBJDIR,
                     haltOnFailure=False,
                     flunkOnFailure=False,
-                    env=MozillaEnvironments['win32-ref-platform']),
+                    env=MozillaEnvironments['tryserver']),
 
     s(ShellCommand, name="chmod package (exe)",
                     command=["chmod", "666",
@@ -723,6 +739,22 @@ firefox_sendchange_hg_win32_steps = [
                 haltOnFailure=False,
                 flunkOnFailure=False,
                 workdir="."),
+
+    s(ShellCommand,
+                name="build symbols",
+                command=["make", "-C", OBJDIR, "buildsymbols"],
+                haltOnFailure=True,
+                flunkOnFailure=False,
+                env=MozillaEnvironments['tryserver'],
+                workdir="."),
+
+     s(ShellCommand,
+                name="upload symbols",
+                command=["make", "-C", OBJDIR, "uploadsymbols"],
+                haltOnFailure=True,
+                flunkOnFailure=False,
+                env=MozillaEnvironments['tryserver'],
+                workdir=".")
 ]
 
 firefox_sendchange_win32_hg_builder = {