diff --git a/README.md b/README.md
index a07961ae8..81cc6b984 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ On the PowerShell side, Empire implements the ability to run PowerShell agents w
 
 Empire relies heavily on the work from several other projects for its underlying functionality. We have tried to call out a few of those people we've interacted with [heavily here](http://www.powershellempire.com/?page_id=2) and have included author/reference link information in the source of each Empire module as appropriate. If we have failed to properly cite existing or prior work, please let us know at Empire@BC-Security.org.
 
-Empire is currently being developed and maintainted by [@Cx01N](https://twitter.com/Cx01N_), [@Hubbl3](https://twitter.com/_Hubbl3), & [@Vinnybod](https://twitter.com/AZHalcyon). While the main Empire project is no longer maintained, this fork is maintained by [@bcsecurity1](https://twitter.com/BCSecurity1).
+Empire is currently being developed and maintained by [@Cx01N](https://twitter.com/Cx01N_), [@Hubbl3](https://twitter.com/_Hubbl3), & [@Vinnybod](https://twitter.com/AZHalcyon). While the main Empire project is no longer maintained, this fork is maintained by [@bcsecurity1](https://twitter.com/BCSecurity1). 
+Please reach out to us on our [Discord](https://discord.gg/P8PZPyf) if you have any questions or talk about offensive security.
 
 Thank you to the original team of developers: [@harmj0y](https://twitter.com/harmj0y), [@sixdub](https://twitter.com/sixdub), [@enigma0x3](https://twitter.com/enigma0x3), [@rvrsh3ll](https://twitter.com/424f424f), [@killswitch_gui](https://twitter.com/killswitch_gui), & [@xorrior](https://twitter.com/xorrior)
 
@@ -45,7 +46,7 @@ git clone https://github.com/BC-SECURITY/Empire.git
 cd Empire
 sudo ./setup/install.sh
 sudo poetry install
-sudo poetry run python empire --rest
+sudo poetry run python empire --rest -n
 ```
 
 ### Kali
@@ -90,6 +91,11 @@ All image versions can be found at: https://hub.docker.com/r/bcsecurity/empire/
 
 Check out the [Empire wiki](https://github.com/BC-SECURITY/Empire/wiki/Quickstart) for instructions on getting started with Empire.
 
+## Plugins
+Plugins are an extension of Empire that allow for custom scripts to be loaded. This allows anyone to easily build or add
+community projects to extend Empire functionality. Plugins can be accessed from the Empire CLI or the API as long as the 
+plugin follows the [template example](./plugins/example.py). A list of Empire Plugins is located [here](plugins/PLUGINS.md).
+
 ## Contribution Rules
 
 Contributions are more than welcome! The more people who contribute to the project the better Empire will be for everyone. Below are a few guidelines for submitting contributions.
diff --git a/VERSION b/VERSION
index 87ce49290..40c341bdc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.2
+3.6.0
diff --git a/changelog b/changelog
index ce8adc7cc..9cf17f17e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,20 @@
+11/9/2020
+------------
+- Version 3.6.0 Master Release
+        - Added new API endpoints for user and agent notes - #383 (@Cx01N)
+        - Added (readded) PowerView function add-netuser - #381 (@Cx01N)
+        - Added Invoke-SharpChisel module - #368 (@Invoke-Mimikatz)
+        - Added command option to psremoting and smbexec - #380 (@Invoke-Mimikatz)
+        - Added option to use multiple redirector listeners and chaining - #389 (@Cx01N)
+        - Added Invoke-Assembly module - #376 (@Invoke-Mimikatz)
+        - Updated API endpoints for dynamic plugin calls - #383 (@Cx01N)
+        - Updated plugin and module templates - #384 (@Cx01N)
+        - Fixed smbscanner to work on Windows 10 - #380 (@Invoke-Mimikatz)
+        - Fixed update agent comms (updatecomms) not properly changing - #382 (@Cx01N)
+        - Fixed download endpoint formatting and error handling - #383 (@Cx01N)
+        - Fixed issue with passing arguments to Get-DomainSID module - #374 (@mjokic)
+        - Fixed bat file length limit issue - #385 (@Hubbl3)
+
 10/22/2020
 ------------
 - Version 3.5.2 Master Release
diff --git a/lib/common/empire.py b/lib/common/empire.py
index 243034919..e5d7284e1 100755
--- a/lib/common/empire.py
+++ b/lib/common/empire.py
@@ -18,7 +18,7 @@
 
 from flask_socketio import SocketIO
 
-VERSION = "3.5.2 BC Security Fork"
+VERSION = "3.6.0 BC Security Fork"
 
 from pydispatch import dispatcher
 
diff --git a/plugins/PLUGINS.md b/plugins/PLUGINS.md
new file mode 100644
index 000000000..931b43d8b
--- /dev/null
+++ b/plugins/PLUGINS.md
@@ -0,0 +1,7 @@
+# Empire Plugins
+
+
+| Plugin                                                                            | Description                                        | Authors         |
+| --------------------------------------------------------------------------------- | -------------------------------------------------- | --------------- |
+| [Socks Proxy Server](https://github.com/BC-SECURITY/SocksProxyServer-Plugin)      | Self-contained server for Invoke-SocksProxy.       | @Cx01N, @mjokic |
+| [Chisel Server](https://github.com/BC-SECURITY/ChiselServer-Plugin)               | Runs chisels from the Empire CLI.                  | @kevin          |
\ No newline at end of file