diff --git a/AMBuildScript b/AMBuildScript
index 3323d9a..5bcab99 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -96,6 +96,10 @@ def SetArchFlags(compiler, arch, platform):
     elif builder.target.arch == 'x86_64':
       compiler.linkflags += ['/MACHINE:X64']
 
+def AppendArchSuffix(binary, name, arch):
+  if arch == 'x86_64':
+    binary.localFolder = name + '.x64'
+
 class MMSConfig(object):
   def __init__(self):
     self.sdks = {}
@@ -367,11 +371,13 @@ class MMSConfig(object):
 
   def LibraryBuilder(self, compiler, name, arch):
     binary = compiler.Library(name)
+    AppendArchSuffix(binary, name, arch)
     self.AddVersioning(binary, arch)
     return binary
 
   def ProgramBuilder(self, compiler, name, arch):
     binary = compiler.Program(name)
+    AppendArchSuffix(binary, name, arch)
     self.AddVersioning(binary, arch)
     if '-static-libgcc' in binary.compiler.linkflags:
       binary.compiler.linkflags.remove('-static-libgcc')
@@ -381,8 +387,9 @@ class MMSConfig(object):
       binary.compiler.linkflags += ['-lstdc++']
     return binary
     
-  def StaticLibraryBuilder(self, compiler, name):
+  def StaticLibraryBuilder(self, compiler, name, arch):
     binary = compiler.StaticLibrary(name)
+    AppendArchSuffix(binary, name, arch)
     return binary;
 
   def Library(self, context, name, arch):
@@ -398,7 +405,7 @@ class MMSConfig(object):
   def StaticLibrary(self, context, name, arch):
     compiler = context.cxx.clone()
     SetArchFlags(compiler, arch, builder.target.platform)
-    return self.StaticLibraryBuilder(compiler, name)
+    return self.StaticLibraryBuilder(compiler, name, arch)
 
   def HL2Library(self, context, name, sdk, arch):
     compiler = self.HL2Compiler(context, sdk, arch)
@@ -436,9 +443,6 @@ class MMSConfig(object):
 
     binary = self.LibraryBuilder(compiler, name, arch)
 
-    if arch == 'x86_64':
-      binary.localFolder = name + ".x64"
-
     dynamic_libs = []
     if builder.target.platform == 'linux':
       compiler.linkflags[0:0] = ['-lm']
diff --git a/core/sourcehook/test/AMBuilder b/core/sourcehook/test/AMBuilder
index ce2f00f..9d6d748 100644
--- a/core/sourcehook/test/AMBuilder
+++ b/core/sourcehook/test/AMBuilder
@@ -9,8 +9,6 @@ for arch in MMS.archs:
   ]
   if binary.compiler.version >= 'clang-2.9' or binary.compiler.version >= 'apple-clang-3.0':
     binary.compiler.cxxflags += ['-Wno-null-dereference']
-  if arch == 'x86_64':
-    binary.localFolder = name + ".x64"
 
   binary.sources += [
     'main.cpp',
diff --git a/loader/AMBuilder b/loader/AMBuilder
index 5a82910..edb24da 100644
--- a/loader/AMBuilder
+++ b/loader/AMBuilder
@@ -11,8 +11,6 @@ def configure_library(name, linux_defines, arch):
     'serverplugin.cpp',
     'utility.cpp',
   ]
-  if arch == 'x86_64':
-    binary.localFolder = name + ".x64"
 
   if builder.target.platform == 'linux':
     binary.compiler.defines += linux_defines
diff --git a/versionlib/AMBuildScript b/versionlib/AMBuildScript
index 0545692..3eb1956 100644
--- a/versionlib/AMBuildScript
+++ b/versionlib/AMBuildScript
@@ -9,8 +9,6 @@ for arch in MMS.archs:
   lib.sources += [
     'versionlib.cpp'
   ]
-  if arch == 'x86_64':
-    lib.localFolder = libname + '.x64'
 
   cmd = builder.Add(lib)