diff --git a/AMBuildScript b/AMBuildScript
index ceb5011c..0756c274 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -517,7 +517,8 @@ SP = SourcePawn(
   root = SM,
   amtl = os.path.join(builder.sourcePath, 'public', 'amtl'),
 )
-SP.BuildCore()
+SP.BuildSpcomp()
+SP.BuildVM()
 SM.spcomp = SP.spcomp
 SM.binaries += [
   SP.libsourcepawn
diff --git a/sourcepawn b/sourcepawn
index d584d55f..ea67e929 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit d584d55f2ad60b58070134fd1645cda27e8cf232
+Subproject commit ea67e929f5bd127ec60331a7ba17d9f1d8d7ab0d