diff --git a/support/buildbot/BreakpadSymbols b/support/buildbot/BreakpadSymbols
index 0a7c11b..86e98e3 100644
--- a/support/buildbot/BreakpadSymbols
+++ b/support/buildbot/BreakpadSymbols
@@ -7,21 +7,26 @@ UPLOAD_SCRIPT = os.path.join(builder.sourcePath, 'support', 'buildbot', 'upload_
 
 cxx_tasks = MMS.binaries
 for cxx_task in cxx_tasks:
-	if builder.target.platform in ['windows']:
+	if cxx_task.target.platform in ['windows']:
 		debug_entry = cxx_task.debug
 	else:
 		debug_entry = cxx_task.binary
 
 	debug_file = os.path.join(builder.buildPath, debug_entry.path)
-	if builder.target.platform == 'linux':
+	if cxx_task.target.platform == 'linux':
 		argv = ['dump_syms', debug_file, os.path.dirname(debug_file)]
-	elif builder.target.platform == 'mac':
+	elif cxx_task.target.platform == 'mac':
 		argv = ['dump_syms', debug_file + '.dSYM']
-	elif builder.target.platform == 'windows':
+	elif cxx_task.target.platform == 'windows':
 		argv = ['dump_syms.exe', debug_file]
 
-	base_file = os.path.split(os.path.dirname(debug_file))[1]
-	symbol_file = base_file + '.breakpad'
+	plat_dir = os.path.dirname(debug_file)
+	bin_dir = os.path.split(plat_dir)[0]
+
+	symbol_file = '{}-{}-{}.breakpad'.format(
+            os.path.split(bin_dir)[1],
+            cxx_task.target.platform,
+            cxx_task.target.arch)
 
 	argv = [sys.executable, UPLOAD_SCRIPT, symbol_file] + argv
 	builder.AddCommand(