diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 5c2fc91229..402f4abc06 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -255,6 +255,9 @@
     <Compile Include="Support\VariableExpression.cs" />
     <Compile Include="ExternalMods.cs" />
     <Compile Include="Graphics\Model.cs" />
+    <Compile Include="UtilityCommands\RegisterModCommand.cs" />
+    <Compile Include="UtilityCommands\UnregisterModCommand.cs" />
+    <Compile Include="UtilityCommands\ClearInvalidModRegistrationsCommand.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileSystem\Folder.cs" />
diff --git a/OpenRA.Game/UtilityCommands/ClearInvalidModRegistrationsCommand.cs b/OpenRA.Game/UtilityCommands/ClearInvalidModRegistrationsCommand.cs
new file mode 100644
index 0000000000..af25d20c3c
--- /dev/null
+++ b/OpenRA.Game/UtilityCommands/ClearInvalidModRegistrationsCommand.cs
@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Linq;
+
+namespace OpenRA.UtilityCommands
+{
+	class ClearInvalidModRegistrationsCommand : IUtilityCommand
+	{
+		string IUtilityCommand.Name { get { return "--clear-invalid-mod-registrations"; } }
+		bool IUtilityCommand.ValidateArguments(string[] args)
+		{
+			return args.Length >= 2 && new string[] { "system", "user", "both" }.Contains(args[1]);
+		}
+
+		[Desc("(system|user|both)", "Removes invalid metadata entries for the in-game mod switcher.")]
+		void IUtilityCommand.Run(Utility utility, string[] args)
+		{
+			ModRegistration type = 0;
+			if (args[1] == "system" || args[1] == "both")
+				type |= ModRegistration.System;
+
+			if (args[1] == "user" || args[1] == "both")
+				type |= ModRegistration.User;
+
+			var mods = new ExternalMods();
+
+			ExternalMod activeMod = null;
+			mods.TryGetValue(ExternalMod.MakeKey(utility.ModData.Manifest), out activeMod);
+			mods.ClearInvalidRegistrations(activeMod, type);
+		}
+	}
+}
diff --git a/OpenRA.Game/UtilityCommands/RegisterModCommand.cs b/OpenRA.Game/UtilityCommands/RegisterModCommand.cs
new file mode 100644
index 0000000000..9221d2a683
--- /dev/null
+++ b/OpenRA.Game/UtilityCommands/RegisterModCommand.cs
@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Linq;
+
+namespace OpenRA.UtilityCommands
+{
+	class RegisterModCommand : IUtilityCommand
+	{
+		string IUtilityCommand.Name { get { return "--register-mod"; } }
+		bool IUtilityCommand.ValidateArguments(string[] args)
+		{
+			return args.Length >= 3 && new string[] { "system", "user", "both" }.Contains(args[2]);
+		}
+
+		[Desc("LAUNCHPATH (system|user|both)", "Generates a mod metadata entry for the in-game mod switcher.")]
+		void IUtilityCommand.Run(Utility utility, string[] args)
+		{
+			ModRegistration type = 0;
+			if (args[2] == "system" || args[2] == "both")
+				type |= ModRegistration.System;
+
+			if (args[2] == "user" || args[2] == "both")
+				type |= ModRegistration.User;
+
+			new ExternalMods().Register(utility.ModData.Manifest, args[1], type);
+		}
+	}
+}
diff --git a/OpenRA.Game/UtilityCommands/UnregisterModCommand.cs b/OpenRA.Game/UtilityCommands/UnregisterModCommand.cs
new file mode 100644
index 0000000000..9e3a9002e2
--- /dev/null
+++ b/OpenRA.Game/UtilityCommands/UnregisterModCommand.cs
@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Linq;
+
+namespace OpenRA.UtilityCommands
+{
+	class UnregisterModCommand : IUtilityCommand
+	{
+		string IUtilityCommand.Name { get { return "--unregister-mod"; } }
+		bool IUtilityCommand.ValidateArguments(string[] args)
+		{
+			return args.Length >= 2 && new string[] { "system", "user", "both" }.Contains(args[1]);
+		}
+
+		[Desc("(system|user|both)", "Removes the mod metadata entry for the in-game mod switcher.")]
+		void IUtilityCommand.Run(Utility utility, string[] args)
+		{
+			ModRegistration type = 0;
+			if (args[1] == "system" || args[1] == "both")
+				type |= ModRegistration.System;
+
+			if (args[1] == "user" || args[1] == "both")
+				type |= ModRegistration.User;
+
+			new ExternalMods().Unregister(utility.ModData.Manifest, type);
+		}
+	}
+}