diff --git a/docs/changelog.rst b/docs/changelog.rst
index e3f7ff2..fcadcbb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,12 +1,28 @@
 ChangeLog
 =========
 
-IMPORTANT: version 1.2 changes script hash indexing in the database,
-so you will need to rebuild your databases from scratch.  Running this
-version will refuse to open the DB and not corrupt it, so you can
-revert to 1.1.x if you wish.  The initial synchronisation process
-should be around 10-15% faster than 1.1, owing to this change and
-Justin Arthur's optimisations from 1.1.1.
+Version 1.4
+-----------
+
+* switch to `aiorpcX <https://github.com/kyuupichan/aiorpcX>`_ for all
+  networking, ``JSON RPC`` and proxy handling
+* proxy detection improvements
+* `documentation <https://electrumx.readthedocs.io/>`_ rewrite
+* new environment variable :envvar:`LOG_FORMAT` to control logging format
+* new environment variable :envvar:`DROP_CLIENT` to cut off unsupported
+     client software
+* coin updates: Litecoin (pooler), bitbayd (kongeo), BTG (wilsonmeier),
+     danny91, wakiyamap, snowgem, Dash (theLazier), fujicoin
+* new coins: Decred (cipherzzz), axe (-k),
+* typo fixes (dax, romanz)
+
+.. note:: the Dash-specific undocumented ``masternode.subscribe()``
+   RPC call was not following the JSON RPC spec; this was shown up by
+   the switch to aiorpcX.  I had to modify the code but it may break
+   Dash clients.
+
+   The Decred implementation doesn't work on mainnet; I will remove it
+   if this remains unfixed.
 
 Version 1.3
 -----------
@@ -43,6 +59,13 @@ Version 1.2.1
 Version 1.2
 -----------
 
+.. note:: version 1.2 changes script hash indexing in the database, so
+  you will need to rebuild your databases from scratch.  Running this
+  version will refuse to open the DB and not corrupt it, so you can
+  revert to 1.1.x if you wish.  The initial synchronisation process
+  should be around 10-15% faster than 1.1, owing to this change and
+  Justin Arthur's optimisations from 1.1.1.
+
 - separate P2PKH from P2PK entries in the history and UTXO databases.
   These were previously amalgamated by address as that is what
   electrum-server used to do.  However Electrum didn't handle P2PK
diff --git a/server/version.py b/server/version.py
index aa201b5..7868d2b 100644
--- a/server/version.py
+++ b/server/version.py
@@ -1,5 +1,5 @@
 # Server name and protocol versions
 
-VERSION = 'ElectrumX 1.3.1a'
+VERSION = 'ElectrumX 1.4'
 PROTOCOL_MIN = '0.9'
 PROTOCOL_MAX = '1.2'
diff --git a/setup.py b/setup.py
index 73a0e37..ed88ac2 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setuptools.setup(
     # "x11_hash" package (1.4) is required to sync DASH network.
     # "tribus_hash" package is required to sync Denarius network.
     # "blake256" package is required to sync Decred network.
-    install_requires=['aiorpcX >= 0.5.2', 'plyvel', 'pylru', 'aiohttp >= 1'],
+    install_requires=['aiorpcX >= 0.5.3', 'plyvel', 'pylru', 'aiohttp >= 1'],
     packages=setuptools.find_packages(exclude=['tests']),
     description='ElectrumX Server',
     author='Neil Booth',