diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfda34123..a3a2743fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,18 @@
+# v0.3.6 (2018-10-22)
+
+ - Updated version of pytest, gunicorn, prometheus_client, urllib3, scp, gevent, certifi, requests
+ - Fixed a few typos
+ - Fixed L2 timeout compared with ARP timeout for Faucet
+ - Fixed creation of files/dirs at container start time for volumes
+ - Added some developer instructions to the Readme
+
 # v0.3.5 (2018-09-21)
 
  - added an inactive state
  - fixed operating system results from p0f
  - fixes roles results from PoseidonML
  - fixed log file creation and rotation
- - 
+ -
 # v0.3.4 (2018-09-10)
 
  - Updated version of pytest and pytest-cov
diff --git a/VERSION b/VERSION
index 455809413..449d7e73a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.6.dev
+0.3.6
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 48a2079c3..df12235c3 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.3.6.dev'
+version = u'0.3.6'
 # The full version, including alpha/beta/rc tags.
-release = u'0.3.6.dev'
+release = u'0.3.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/installers/debian/control b/installers/debian/control
index e82942601..18ebb924b 100644
--- a/installers/debian/control
+++ b/installers/debian/control
@@ -1,5 +1,5 @@
 Package: poseidon
-Version: 0.3.6.dev
+Version: 0.3.6
 Section: base
 Priority: optional
 Architecture: all