diff --git a/tools/buildbot/PackageScript b/tools/buildbot/PackageScript
index 5e95dc83..2d788f3f 100644
--- a/tools/buildbot/PackageScript
+++ b/tools/buildbot/PackageScript
@@ -186,18 +186,22 @@ bincopies = []
 def AddNormalLibrary(name, dest):
 	dest = os.path.join('addons', 'sourcemod', dest)
 	bincopies.append(CopyFile(os.path.join('..', name, name + osutil.SharedLibSuffix()), dest))
+	pdb_list.append(name + '\\' + name + '.pdb')
 
 def AddHL2Library(name, dest):
 	for i in SM.sdkInfo:
 		sdk = SM.sdkInfo[i]
 		AddNormalLibrary(name + '.' + sdk['ext'], dest)
 
+pdb_list = []
+
 if AMBuild.target['platform'] == 'linux':
 	bincopies.append(CopyFile(os.path.join('..', 'loader', 'sourcemod_mm_i486.so'),
 	                 os.path.join('addons', 'sourcemod', 'bin')))
 elif AMBuild.target['platform'] == 'windows':
 	bincopies.append(CopyFile(os.path.join('..', 'loader', 'sourcemod_mm.dll'),
 	                 os.path.join('addons', 'sourcemod', 'bin')))
+	pdb_list.append('loader\\sourcemod_mm.pdb')
 
 AddHL2Library('sourcemod', 'bin')
 AddNormalLibrary('sourcepawn.jit.x86', 'bin')
@@ -223,4 +227,8 @@ if AMBuild.target['platform'] == 'windows':
 	job.AddCommand(CopyFile(
 		os.path.join(AMBuild.sourceFolder, 'sourcepawn', 'batchtool', 'compile.exe'),
 		os.path.join('addons', 'sourcemod', 'scripting')))
+	pdblog = open(os.path.join(AMBuild.outputFolder, 'pdblog.txt'), 'wt')
+	for pdb in pdb_list:
+		pdblog.write(pdb + '\n')
+	pdblog.close()
 
diff --git a/tools/buildbot/package.pl b/tools/buildbot/package.pl
index 6d4226fc..559eacf5 100755
--- a/tools/buildbot/package.pl
+++ b/tools/buildbot/package.pl
@@ -33,7 +33,7 @@ my ($version);
 
 $version = Build::ProductVersion(Build::PathFormat('../../build/product.version'));
 $version =~ s/-dev//g;
-$version .= '-hg' . Build::HgRevNum('../..');
+$version .= '-hg' . Build::HgRevNum('../../build');
 
 my ($filename);
 $filename = 'sourcemod-' . $version;
diff --git a/tools/buildbot/symstore.pl b/tools/buildbot/symstore.pl
index d3a9d533..d86d3350 100755
--- a/tools/buildbot/symstore.pl
+++ b/tools/buildbot/symstore.pl
@@ -12,7 +12,7 @@ chdir('..');
 
 our $SSH = 'ssh -i ../../smpvkey';
 
-open(PDBLOG, 'OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
+open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
 
 #Sync us up with the main symbol store
 rsync('sourcemod@alliedmods.net:~/public_html/symbols/', '..\\..\\symstore');
@@ -40,7 +40,7 @@ while (<PDBLOG>)
 	$line = $_;
 	$line =~ s/\.pdb/\*/;
 	chomp $line;
-	Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\"");
+	Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\"");
 }
 
 close(PDBLOG);