diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h
index 4064935ab..56867af17 100644
--- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h	
+++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h	
@@ -30,7 +30,10 @@ typedef NS_ENUM(NSInteger, CSMachineCPCModel) {
 };
 
 typedef NS_ENUM(NSInteger, CSMachineMacintoshModel) {
-	CSMachineMacintoshModel128k
+	CSMachineMacintoshModel128k,
+	CSMachineMacintoshModel512k,
+	CSMachineMacintoshModel512ke,
+	CSMachineMacintoshModelPlus,
 };
 
 typedef NS_ENUM(NSInteger, CSMachineOricModel) {
diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
index d884d1d3e..ee187bfbf 100644
--- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
+++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
@@ -197,6 +197,16 @@ static Analyser::Static::ZX8081::Target::MemoryModel ZX8081MemoryModelFromSize(K
 		using Target = Analyser::Static::Macintosh::Target;
 		std::unique_ptr<Target> target(new Target);
 		target->machine = Analyser::Machine::Macintosh;
+
+		using Model = Target::Model;
+		switch(model) {
+			default:
+			case CSMachineMacintoshModel128k:	target->model = Model::Mac128k;		break;
+			case CSMachineMacintoshModel512k:	target->model = Model::Mac512k;		break;
+			case CSMachineMacintoshModel512ke:	target->model = Model::Mac512ke;	break;
+			case CSMachineMacintoshModelPlus:	target->model = Model::MacPlus;		break;
+		}
+
 		_targets.push_back(std::move(target));
 	}
 	return self;
diff --git a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift
index 4ea8fff39..1d1874857 100644
--- a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
+++ b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
@@ -158,7 +158,7 @@ class MachinePicker: NSObject {
 				}
 
 			case "mac":
-				return CSStaticAnalyser(macintoshModel: .model128k)
+				return CSStaticAnalyser(macintoshModel: .model512ke)
 
 			case "msx":
 				let hasDiskDrive = msxHasDiskDriveButton!.state == .on