diff --git a/tools/builder/ABuilder.cs b/tools/builder/ABuilder.cs
index 22d83830..97f01a08 100644
--- a/tools/builder/ABuilder.cs
+++ b/tools/builder/ABuilder.cs
@@ -16,6 +16,62 @@ namespace builder
 
 		public abstract bool BuildLibrary(Package pkg, Library lib, ref string _binName, ref string _binPath);
 
+		public abstract string GetPawnCompilerName();
+
+		public bool CompilePlugin(Package pkg, Plugin pl)
+		{
+			string local_dir = Config.PathFormat("{0}/{1}/scripting", cfg.OutputBase, pkg.GetBaseFolder());
+
+			string filepath = null;
+			if (pl.Folder != null)
+			{
+				filepath = Config.PathFormat("{0}/{1}", pl.Folder, pl.Source);
+			} 
+			else 
+			{
+				filepath = pl.Source;
+			}
+
+			ProcessStartInfo info = new ProcessStartInfo();
+			info.WorkingDirectory = local_dir;
+			info.FileName = Config.PathFormat("{0}/{1}", local_dir, GetPawnCompilerName());
+			info.Arguments = filepath + ".sp";
+			info.UseShellExecute = false;
+			info.RedirectStandardOutput = true;
+			info.RedirectStandardError = true;
+
+			Process p = Process.Start(info);
+			string output = p.StandardOutput.ReadToEnd() + "\n";
+			output += p.StandardError.ReadToEnd();
+			p.WaitForExit();
+			p.Close();
+
+			Console.WriteLine(output);
+
+			string binary = Config.PathFormat("{0}/{1}/scripting/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source);
+			if (!File.Exists(binary))
+			{
+				return false;
+			}
+			string new_loc = Config.PathFormat("{0}/{1}/plugins/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source);
+
+			try
+			{
+				if (File.Exists(new_loc))
+				{
+					File.Delete(new_loc);
+				}
+				File.Move(binary, new_loc);
+			}
+			catch (System.Exception e)
+			{
+				Console.WriteLine(e.Message);
+				return false;
+			}
+
+			return true;
+		}
+
 		public string GetRevsionOfPath(string path)
 		{
 			ProcessStartInfo info = new ProcessStartInfo();
@@ -172,6 +228,19 @@ namespace builder
 				}
 			}
 
+			/* Do plugins */
+			Plugin [] plugins = pkg.GetPlugins();
+			if (plugins != null)
+			{
+				for (int i=0; i<plugins.Length; i++)
+				{
+					if (!CompilePlugin(pkg, plugins[i]))
+					{
+						throw new System.Exception("Failed to compile plugin: " + plugins[i].Source);
+					}
+				}
+			}
+
 			string pkg_file = null;
 			if (cfg.Compressor != null)
 			{
diff --git a/tools/builder/LinuxBuilder.cs b/tools/builder/LinuxBuilder.cs
index a352bdb9..a90f24c3 100644
--- a/tools/builder/LinuxBuilder.cs
+++ b/tools/builder/LinuxBuilder.cs
@@ -11,6 +11,11 @@ namespace builder
 			cfg = _cfg;
 		}
 
+		public override string GetPawnCompilerName()
+		{
+			return "spcomp";
+		}
+
 		public override string CompressPackage(Package pkg)
 		{
 			string lpath = null, ltarget = null;
diff --git a/tools/builder/Package.cs b/tools/builder/Package.cs
index 481f2f6c..3d92c0ad 100644
--- a/tools/builder/Package.cs
+++ b/tools/builder/Package.cs
@@ -7,7 +7,6 @@ namespace builder
 		public Library()
 		{
 			PlatformExt = false;
-			ProjectFile = null;
 			IsExecutable = false;
 			ReleaseBuild = "Release";
 		}
@@ -21,6 +20,21 @@ namespace builder
 		//string DebugBuild;		/* Debug build name */
 	};
 
+	public class Plugin
+	{
+		public Plugin(string file)
+		{
+			Source = file;
+		}
+		public Plugin (string file, string folder)
+		{
+			Source = file;
+			Folder = folder;
+		}
+		public string Folder;		/* Source folder relative to scripting (null for default) */
+		public string Source;		/* Source file name */
+	};
+
 	public abstract class Package
 	{
 		/**
@@ -57,5 +71,10 @@ namespace builder
 		 * Called to get package name
 		 */
 		public abstract string GetPackageName();
+
+		/**
+		 * Called to get a plugin list
+		 */
+		public abstract Plugin [] GetPlugins();
 	}
 }
diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs
index d73aee80..795521f6 100644
--- a/tools/builder/PkgCore.cs
+++ b/tools/builder/PkgCore.cs
@@ -115,6 +115,19 @@ namespace builder
 
 			return libs;
 		}
+
+		/**
+		 * Called to build plugins
+		 */
+		public override Plugin [] GetPlugins()
+		{
+			Plugin [] plugins = new Plugin[2];
+
+			plugins[0] = new Plugin("admin-auth");
+			plugins[1] = new Plugin("admin-flatfile", "admin-flatfile");
+
+			return plugins;
+		}
 	}
 }
 
diff --git a/tools/builder/Win32Builder.cs b/tools/builder/Win32Builder.cs
index 0d1b5ddb..22828424 100644
--- a/tools/builder/Win32Builder.cs
+++ b/tools/builder/Win32Builder.cs
@@ -11,6 +11,11 @@ namespace builder
 			cfg = _cfg;
 		}
 
+		public override string GetPawnCompilerName()
+		{
+			return "spcomp.exe";
+		}
+
 		public override string CompressPackage(Package pkg)
 		{
 			string lpath = null, ltarget = null;