diff --git a/EntitasUpgradeGuide.md b/EntitasUpgradeGuide.md
index 53bc48b48..5a67792e7 100644
--- a/EntitasUpgradeGuide.md
+++ b/EntitasUpgradeGuide.md
@@ -5,6 +5,25 @@ https://bugzilla.xamarin.com/show_bug.cgi?id=25360
 Please be aware of that issue and use any other text editor for that task.
 
 
+# Entitas 0.18.0 upgrade guide
+Entitas 0.18.0 changes IReactiveSystem. To upgrade your source files, follow these steps
+- Install Entitas 0.18.0 (which will result in compiler errors)
+- Use the command line tool `MigrationAssistant.exe` to automatically migrate
+
+```
+$ mono MigrationAssistant.exe
+usage:
+[-l]             - print all available versions
+[version] [path] - apply migration of version [version] to source files located at [path]
+
+$ mono MigrationAssistant.exe -l
+0.18.0 - Migrates IReactiveSystem API
+
+// Example from Math-One example project, where all the systems are located in the Features folder
+$ mono MigrationAssistant.exe 0.18.0 /Path/To/Project/Assets/Sources/Features
+```
+
+
 # Entitas 0.12.0 upgrade guide
 
 Entitas 0.12.0 generates prefixed matchers based on the PoolAttribute and introduces some
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3257735f2..632613339 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -5,18 +5,7 @@
     - Changed IReactiveSystem.GetTriggeringMatcher to IReactiveSystem.trigger
     - Changed IReactiveSystem.GetEventType to IReactiveSystem.eventType
 
-```
-$ mono MigrationAssistant.exe
-usage:
-[-l]             - print all available versions
-[version] [path] - apply migration of version [version] to source files located at [path]
-
-$ mono MigrationAssistant.exe -l
-0.18.0 - Migrates IReactiveSystem API
-
-// Example from Math-One example project, where all the systems are located in the Features folder
-$ mono MigrationAssistant.exe 0.18.0 /Path/To/Project/Assets/Sources/Features
-```
+Please follow the [Entitas upgrade guide](https://github.com/sschmid/Entitas-CSharp/blob/master/EntitasUpgradeGuide.md)
 
 ##### Entitas.Unity
 - Fixed code generation issues on Windows by converting and normalizing line endings
diff --git a/bin/Entitas.zip b/bin/Entitas.zip
index 12a961070..7a071a0e3 100644
Binary files a/bin/Entitas.zip and b/bin/Entitas.zip differ