diff --git a/doc/conf.py b/doc/conf.py
index 422c0fc6a..aa05be93b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -44,16 +44,16 @@
 # General information about the project.
 project = u'Elephant'
 authors = u'Elephant authors and contributors'
-copyright = u'2014-2016, ' + authors
+copyright = u'2014-2017, ' + authors
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.3'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.0'
+release = '0.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/install.rst b/doc/install.rst
index 533eb5b07..79ac8dee4 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -15,15 +15,13 @@ The following packages are required to use Elephant:
     * numpy_ >= 1.8.2
     * scipy_ >= 0.14.0
     * quantities_ >= 0.10.1
-    * neo_ == 0.4.0
-
-.. note:: at the time of writing Neo 0.4.0 has not been released. You should therefore use `this snapshot`_.
+    * neo_ == 0.5.0
 
 The following packages are optional in order to run certain parts of Elephant:
     * For using the pandas_bridge module: 
         * pandas >= 0.14.1
     * For using the ASSET analysis
-	* scikit-learn >= 0.15.1
+    * scikit-learn >= 0.15.1
     * For building the documentation:
         * numpydoc >= 0.5
         * sphinx >= 1.2.2
@@ -75,8 +73,8 @@ To download and install manually, download the latest package from http://pypi.p
 
 Then::
 
-    $ tar xzf elephant-0.3.0.tar.gz
-    $ cd elephant-0.3.0
+    $ tar xzf elephant-0.4.0.tar.gz
+    $ cd elephant-0.4.0
     $ python setup.py install
     
 or::
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index f7c3ac098..177b57216 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -2,6 +2,32 @@
 Release Notes
 *************
 
+Elephant 0.4.0 release notes
+============================
+March 20th 2017
+
+New functions
+=============
+* `spike_train_generation` module:
+    * peak detection: **peak_detection()**
+* Modules for Current Source Density: `current_source_density_src`
+    * Module Current Source Density: `KCSD.py`
+    * Module for Inverse Current Source Density: `icsd.py`
+
+API changes
+===========
+* Interoperability between Neo 0.5.0beta1 and Elephant
+    * Elephant has adapted its functions to the changes in Neo 0.5.0,
+      most of the functionality behaves as before
+    * See Neo documentation for recent changes: http://neo.readthedocs.io/en/latest/whatisnew.html
+
+Other changes
+=============
+* Fixes to travis and setup configuration files.
+* Minor bug fixes.
+* Added module `six` for Python 2.7 backwards compatibility
+
+
 Elephant 0.3.0 release notes
 ============================
 April 12st 2016
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 449d7022f..2a682941a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,6 @@
 # Requirements for building documentation
 numpy>=1.8.2
 quantities>=0.10.1
--e git+https://github.com/NeuralEnsemble/python-neo.git@snapshot-20150821#egg=neo-snapshot-20150821
-# note that we use a mock scipy
+neo>=0.4.1
 numpydoc
 sphinx
diff --git a/elephant/__init__.py b/elephant/__init__.py
index 90bbb1641..c40d774c3 100644
--- a/elephant/__init__.py
+++ b/elephant/__init__.py
@@ -27,4 +27,4 @@
 except ImportError:
     pass
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
diff --git a/setup.py b/setup.py
index 949a1a2a3..593f275cf 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name="elephant",
-    version='0.3.0',
+    version='0.4.0',
     packages=['elephant', 'elephant.test'],
     package_data = {'elephant' : [os.path.join('csd_methods', 'test_data.mat'),
                                   os.path.join('csd_methods', 'LICENSE'),