diff --git a/build.ps1 b/build.ps1
index a84a1de8e..b7ce1cfac 100644
--- a/build.ps1
+++ b/build.ps1
@@ -74,6 +74,12 @@ Function PackageMono()
     Write-Host Removing Update Client 
     Remove-Item -Recurse -Force "$outputFolderMono\NzbDrone.Update"
 
+    Write-Host Creating MDBs
+    get-childitem $outputFolderMono -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
+        Write-Host "Creating .mdb for $_"
+        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
+    }
+
     Write-Host Removing PDBs
     get-childitem $outputFolderMono -File -Filter *.pdb -Recurse | foreach ($_) {remove-item $_.fullname}
 
@@ -89,8 +95,15 @@ Function PackageMono()
     Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" $outputFolderMono
 
     Write-Host Renaming NzbDrone.Console.exe to NzbDrone.exe
-    get-childitem $outputFolderMono -File -Filter NzbDrone.exe -Recurse  | foreach ($_) {remove-item $_.fullname}
-    Rename-Item "$outputFolderMono\NzbDrone.Console.exe" "NzbDrone.exe"
+    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.exe*" -Recurse  | foreach ($_) {remove-item $_.fullname}
+
+    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.Console.exe*" -Recurse  | foreach ($_) {
+        $newName = $_.fullname -Replace ".Console",""
+
+        Rename-Item $_.fullname $newName
+    }
+
+    Remove-Item "$outputFolderMono\NzbDrone.Console.vshost.exe"
 
     Write-Host "##teamcity[progressFinish 'Creating Mono Package']"
 }
diff --git a/tools/pdb2mdb/Mono.Cecil.Mdb.dll b/tools/pdb2mdb/Mono.Cecil.Mdb.dll
new file mode 100644
index 000000000..5b119cb49
Binary files /dev/null and b/tools/pdb2mdb/Mono.Cecil.Mdb.dll differ
diff --git a/tools/pdb2mdb/Mono.Cecil.dll b/tools/pdb2mdb/Mono.Cecil.dll
new file mode 100644
index 000000000..4b5646655
Binary files /dev/null and b/tools/pdb2mdb/Mono.Cecil.dll differ
diff --git a/tools/pdb2mdb/Mono.CompilerServices.SymbolWriter.dll b/tools/pdb2mdb/Mono.CompilerServices.SymbolWriter.dll
new file mode 100644
index 000000000..e14192d54
Binary files /dev/null and b/tools/pdb2mdb/Mono.CompilerServices.SymbolWriter.dll differ
diff --git a/tools/pdb2mdb/pdb2mdb.exe b/tools/pdb2mdb/pdb2mdb.exe
new file mode 100644
index 000000000..31a1f9e34
Binary files /dev/null and b/tools/pdb2mdb/pdb2mdb.exe differ