diff --git a/AMBuildScript b/AMBuildScript
index 7a517f9d..85c12c97 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -197,7 +197,9 @@ class SMConfig(object):
     if builder.options.mms_path:
       self.mms_root = builder.options.mms_path
     else:
-      self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
+      self.mms_root = ResolveEnvPath('MMSOURCE111', 'mmsource-1.11')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
       if not self.mms_root:
         self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
       if not self.mms_root:
diff --git a/loader/loader.cpp b/loader/loader.cpp
index 563eb7bb..10bf02ca 100644
--- a/loader/loader.cpp
+++ b/loader/loader.cpp
@@ -334,11 +334,13 @@ DLL_EXPORT METAMOD_PLUGIN *CreateInterface_MMS(const MetamodVersionInfo *mvi, co
 			filename = FILENAME_1_6_DOI;
 			break;
 		}
+#ifdef SOURCE_ENGINE_MOCK
 	case SOURCE_ENGINE_MOCK:
 		{
 			filename = FILENAME_1_6_MOCK;
 			break;
 		}
+#endif
 	default:
 		{
 			return NULL;