diff --git a/tools/buildbot/PackageScript b/tools/buildbot/PackageScript
index c61d34ec..d55b4ab9 100644
--- a/tools/buildbot/PackageScript
+++ b/tools/buildbot/PackageScript
@@ -42,7 +42,7 @@ if 'x86_64' in SM.target_archs:
   folder_list.extend([
     'addons/sourcemod/bin/x64',
     'addons/sourcemod/extensions/x64',
-  ])		
+  ])
 
 # Create the distribution folder hierarchy.
 folder_map = {}
@@ -69,7 +69,7 @@ for cxx_task in SM.spvm:
     builder.AddCopy(cxx_task.binary, dest_path)
   elif cxx_task.target.arch == 'x86_64':
     builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/bin/x64'])
-    
+
 def lipo(binaries, outFolder):
   bins = []
   binPaths = []
@@ -82,7 +82,7 @@ def lipo(binaries, outFolder):
   builder.AddCommand(
     argv = argv + binPaths + ['-output', outputPath],
     inputs = bins,
-	outputs = [os.path.join(outFolder, binary)],
+    outputs = [os.path.join(outFolder, binary)],
   )
 
 if builder.host.platform == 'mac' and len(SM.target_archs) > 1:
@@ -90,7 +90,8 @@ if builder.host.platform == 'mac' and len(SM.target_archs) > 1:
 else:
   for bin_task in SM.spcomp_bins:
     if bin_task.target.arch == 'x86_64':
-      file = os.path.basename(bin_task.binary.path) + '64'
+      root, ext = os.path.splitext(os.path.basename(bin_task.binary.path))
+      file = root + '64' + ext
       builder.AddCopy(bin_task.binary, os.path.normpath('addons/sourcemod/scripting/' + file))
     else:
       builder.AddCopy(bin_task.binary, folder_map['addons/sourcemod/scripting'])
@@ -204,9 +205,9 @@ CopyFiles('gamedata/sdkhooks.games', 'addons/sourcemod/gamedata/sdkhooks.games',
     'game.hidden.txt',
     'game.hl2ctf.txt',
     'game.insurgency.txt',
-	'game.kz.txt',
+    'game.kz.txt',
     'game.l4d2.txt',
-	'game.modularcombat.txt',
+    'game.modularcombat.txt',
     'game.neotokyo.txt',
     'game.nmrih.txt',
     'game.nucleardawn.txt',
@@ -259,9 +260,9 @@ CopyFiles('gamedata/sdktools.games', 'addons/sourcemod/gamedata/sdktools.games',
     'game.hl2mp.txt',
     'game.insurgency.txt',
     'game.ios.txt',
-	'game.kz.txt',
+    'game.kz.txt',
     'game.left4dead2.txt',
-	'game.modularcombat.txt',
+    'game.modularcombat.txt',
     'game.neotokyo.txt',
     'game.nmrih.txt',
     'game.nucleardawn.txt',