diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 934ad24c..46b2dcc5 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -48,7 +48,7 @@ namespace TShockAPI
 	/// This is the TShock main class. TShock is a plugin on the TerrariaServerAPI, so it extends the base TerrariaPlugin.
 	/// TShock also complies with the API versioning system, and defines its required API version here.
 	/// </summary>
-	[ApiVersion(1, 26)]
+	[ApiVersion(2, 0)]
 	public class TShock : TerrariaPlugin
 	{
 		/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 5144badb..9e87b3a3 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 5144badb7e087ab1b8ba72c29b08b2e550873a1a
+Subproject commit 9e87b3a33f0cb97b4e0a72e2694c3f69bb55b63e