diff --git a/AMBuildScript b/AMBuildScript
index 551800d..3a99d32 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -95,12 +95,16 @@ class MMSConfig(object):
     use_present = sdk_list[0] == 'present'
     if sdk_list[0] == '':
         sdk_list = []
+    if use_all or use_present:
+        sdk_list = []
 
     not_found = []
     for sdk_name, sdk in SdkHelpers.getSdks(builder):
       self.sdk_manifests.append(sdk)
       if not self.shouldIncludeSdk(sdk):
         continue
+      if sdk_list and sdk_name not in sdk_list:
+        continue
 
       sdk_path = self.findSdkPath(sdk_name)
       if sdk_path is None:
diff --git a/hl2sdk-manifests b/hl2sdk-manifests
index fa9ffa2..60cbe38 160000
--- a/hl2sdk-manifests
+++ b/hl2sdk-manifests
@@ -1 +1 @@
-Subproject commit fa9ffa26e5c3a10870ce7364d5b73aa3a98ccd97
+Subproject commit 60cbe38807c0fae03d5f2abcce519a2ae4e04cd0