diff --git a/AMBuildScript b/AMBuildScript
index 96717eda..0e4aa419 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -379,6 +379,16 @@ class SMConfig(object):
   def configure_windows(self, cxx):
     cxx.defines += ['WIN32', '_WINDOWS']
 
+  def add_libamtl(self):
+    # Add libamtl.
+    self.libamtl = {}
+    for arch in self.archs:
+      def get_configure_fn(arch):
+        return lambda builder, name: self.StaticLibrary(builder, name, arch)
+      extra_vars = {'Configure': get_configure_fn(arch)}
+      libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars)
+      self.libamtl[arch] = libamtl.binary
+
   def AddVersioning(self, binary, arch):
     if builder.target.platform == 'windows':
       binary.sources += ['version.rc']
@@ -613,6 +623,7 @@ SM = SMConfig()
 SM.detectProductVersion()
 SM.detectSDKs()
 SM.configure()
+SM.add_libamtl()
 
 if SM.use_auto_versioning():
   SM.generated_headers = builder.Build(
diff --git a/public/amtl b/public/amtl
index e00a845c..eb7b6ba0 160000
--- a/public/amtl
+++ b/public/amtl
@@ -1 +1 @@
-Subproject commit e00a845c6bc415995ddc4b7ec538d1704fdd0122
+Subproject commit eb7b6ba084e13c50f7c2c53b285e6e6af44accd9
diff --git a/sourcepawn b/sourcepawn
index 7ba3e384..08143d0c 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 7ba3e384e29ccdb5dbd3ac4a0fda16fd0a0144a8
+Subproject commit 08143d0c1879cb38ab9f5d1136cd8da040b0500a