diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe
index c3ab2b08..f12bb263 100755
Binary files a/installer/AMXXRelease/AMXXRelease.exe and b/installer/AMXXRelease/AMXXRelease.exe differ
diff --git a/installer/AMXXRelease/CoreMod.cs b/installer/AMXXRelease/CoreMod.cs
index 64b3f85f..263f5425 100755
--- a/installer/AMXXRelease/CoreMod.cs
+++ b/installer/AMXXRelease/CoreMod.cs
@@ -146,6 +146,7 @@ private void AddModules()
 			Module sockets = new Module("sockets");
 			Module regex = new Module("regex");
 			Module nvault = new Module("nvault");
+			Module sammich = new Module("hamsandwich");
 
 			m_Modules.Add(core);
 			m_Modules.Add(mysqlx);
@@ -157,6 +158,7 @@ private void AddModules()
 			m_Modules.Add(regex);
 			m_Modules.Add(nvault);
 			m_Modules.Add(sqlitex);
+			m_Modules.Add(sammich);
 		}
 	}
 }
diff --git a/installer/AMXXRelease/LinuxBuilder.cs b/installer/AMXXRelease/LinuxBuilder.cs
index 6a9d5778..afece6a7 100755
--- a/installer/AMXXRelease/LinuxBuilder.cs
+++ b/installer/AMXXRelease/LinuxBuilder.cs
@@ -39,10 +39,7 @@ public override void CompressDir(string target, string dir)
 			
 
 
-			if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
-				info.Arguments = "zcvf \"" + target + "_amd64.tar.gz\" " + file_list;
-			else
-				info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
+			info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
 			info.UseShellExecute = false;
 
 			Process p = Process.Start(info);
@@ -66,10 +63,7 @@ public override void AmxxPc(string inpath, string args)
 
 		public override string GetLibExt()
 		{
-			if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
-				return "_amd64.so";
-			else
-				return "_i386.so";
+			return "_i386.so";
 		}
 
 		public override string BuildModule(Module module)
@@ -110,8 +104,6 @@ public override string BuildModule(Module module)
 			//Now we need to see if the DL handle is valid!
 			string dlsym_dir = m_Cfg.GetSourceTree() + "\\plugins";
 			string dlsym = dlsym_dir + "\\dlsym";
-			if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
-				dlsym += "64";
 			dlsym = PropSlashes(dlsym);
 			dlsym_dir = PropSlashes(dlsym_dir);
 			info.WorkingDirectory = dlsym_dir;
diff --git a/installer/AMXXRelease/Win32Builder.cs b/installer/AMXXRelease/Win32Builder.cs
index ea637453..7025085a 100755
--- a/installer/AMXXRelease/Win32Builder.cs
+++ b/installer/AMXXRelease/Win32Builder.cs
@@ -66,16 +66,16 @@ public override string BuildModule(Module module)
 			string args = m_Cfg.MakeOpts();
 			if (args != null)
 			{
-				info.Arguments = args;
+				info.Arguments = args + " ";
 			} 
 			else 
 			{
 				info.Arguments = "";
 			}
-			
+
 			info.WorkingDirectory = PropSlashes(dir);
 			info.FileName = m_Cfg.DevenvPath();
-			info.Arguments = "/rebuild " + module.build + " " + module.vcproj + ".vcproj";
+			info.Arguments += "/rebuild " + module.build + " " + module.vcproj + ".vcproj";
 			info.UseShellExecute = false;
 
 			Process p = Process.Start(info);