diff --git a/tools/builder/ABuilder.cs b/tools/builder/ABuilder.cs
index 33abf7cd..dc1f95d0 100644
--- a/tools/builder/ABuilder.cs
+++ b/tools/builder/ABuilder.cs
@@ -12,7 +12,7 @@ namespace builder
 		{
 		}
 
-		public abstract bool BuildLibrary(Package pkg, Library lib, ref string _binName, ref string _binPath);
+		public abstract bool BuildLibrary(Package pkg, Library lib);
 
 		public abstract string GetPawnCompilerName();
 
@@ -168,7 +168,6 @@ namespace builder
 
 			/* Do libraries */
 			Library [] libs = pkg.GetLibraries();
-			string bin = null, binpath = null;
 			for (int i=0; i<libs.Length; i++)
 			{
 				if (cfg.Platform == BasePlatform.Platform_Linux
@@ -176,16 +175,7 @@ namespace builder
 				{
 					continue;
 				}
-				if (BuildLibrary(pkg, libs[i], ref bin, ref binpath))
-				{
-					path = Config.PathFormat("{0}/{1}/{2}/{3}",
-						cfg.pkg_path,
-						pkg.GetBaseFolder(),
-						libs[i].package_path,
-						bin);
-					File.Copy(binpath, path, true);
-				}
-				else 
+				if (!BuildLibrary(pkg, libs[i]))
 				{
 					throw new System.Exception("Failed to compile library: " + libs[i].binary_name);
 				}
diff --git a/tools/builder/LinuxBuilder.cs b/tools/builder/LinuxBuilder.cs
index c326c6c1..a4eeccf5 100644
--- a/tools/builder/LinuxBuilder.cs
+++ b/tools/builder/LinuxBuilder.cs
@@ -16,7 +16,7 @@ namespace builder
 			return "spcomp";
 		}
 
-		public override bool BuildLibrary(Package pkg, Library lib, ref string _binName, ref string _binPath)
+		public override bool BuildLibrary(Package pkg, Library lib)
 		{
 			ProcessStartInfo info = new ProcessStartInfo();
 
@@ -94,8 +94,12 @@ namespace builder
 				return false;
 			}
 			
-			_binName = binName;
-			_binPath = binpath;
+			path = Config.PathFormat("{0}/{1}/{2}/{3}",
+				cfg.pkg_path,
+				pkg.GetBaseFolder(),
+				lib.package_path,
+				binName);
+			File.Copy(binpath, path, true);
 
 			return true;
 		}
diff --git a/tools/builder/Win32Builder.cs b/tools/builder/Win32Builder.cs
index 08095761..eff27468 100644
--- a/tools/builder/Win32Builder.cs
+++ b/tools/builder/Win32Builder.cs
@@ -16,7 +16,7 @@ namespace builder
 			return "spcomp.exe";
 		}
 
-		public override bool BuildLibrary(Package pkg, Library lib, ref string _binName, ref string _binPath)
+		public override bool BuildLibrary(Package pkg, Library lib)
 		{
 			ProcessStartInfo info = new ProcessStartInfo();
 
@@ -94,8 +94,17 @@ namespace builder
 				return false;
 			}
 
-			_binName = binName;
-			_binPath = binpath;
+			path = Config.PathFormat("{0}/{1}/{2}/{3}",
+				cfg.pkg_path,
+				pkg.GetBaseFolder(),
+				lib.package_path,
+				binName);
+			File.Copy(binpath, path, true);
+
+			/* On Windows we package the .pdb files as well */
+			binpath = binpath.Replace(".dll", ".pdb");
+			path = path.Replace(".dll", ".pdb");
+			File.Copy(binpath, path, true);
 
 			return true;
 		}