diff --git a/VersionUpdateQuest.esp b/VersionUpdateQuest.esp
new file mode 100644
index 00000000..ade2c7f6
Binary files /dev/null and b/VersionUpdateQuest.esp differ
diff --git a/scripts/EnderalUpgradeAlias.pex b/scripts/EnderalUpgradeAlias.pex
new file mode 100644
index 00000000..48a75712
Binary files /dev/null and b/scripts/EnderalUpgradeAlias.pex differ
diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index e380ebf9..56f2f706 100644
Binary files a/scripts/_00e_playersetupscript.pex and b/scripts/_00e_playersetupscript.pex differ
diff --git a/source/scripts/EnderalUpgradeAlias.psc b/source/scripts/EnderalUpgradeAlias.psc
new file mode 100644
index 00000000..a7a203c1
--- /dev/null
+++ b/source/scripts/EnderalUpgradeAlias.psc
@@ -0,0 +1,24 @@
+Scriptname EnderalUpgradeAlias extends ReferenceAlias Hidden 
+{This script handles game version upgrades, DO NOT MODIFY.}
+
+Float Property CURRENT_PATCH_VERSION = 2.1 AutoReadOnly
+float fPatchVersion
+
+Event OnInit()
+
+	; MQP01
+	if (Game.GetForm(0x46F1A) as Quest).GetStageDone(10)
+		Debug.MessageBox("A savegame was loaded which was made before the release of Enderal SE 2.1. In this save, several new features won't be available and there is a chance that you'll encounter grave bugs. Please, start a new game.")
+		;Game.QuitToMainMenu()
+	endif
+
+EndEvent
+
+Event OnPlayerLoadGame()
+
+	if fPatchVersion < CURRENT_PATCH_VERSION
+		;
+		fPatchVersion = CURRENT_PATCH_VERSION
+	endif
+
+EndEvent
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index 03cf3ea0..3f6af292 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -146,12 +146,6 @@ function CheckForgottenStories()
 endfunction
 
 Function Maintenance()
-	
-	if fPatchVersion <= 2.13
-		Debug.MessageBox("A savegame was loaded which was made before the release of Enderal SE. In this save, several new features won't be available and there is a chance that you'll encounter grave bugs. Please, start a new game.")
-		;Game.QuitToMainMenu()
-		;return
-	endif
 
 	if fPatchVersion < CURRENT_PATCH_VERSION
 		;