diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e88eb5b09..178e5406f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,5 @@
-3.0.4.dev0
-==========
-
-*
+3.0.4
+=====
 
 * Import errors when collecting test modules now display the full traceback (`#1976`_).
   Thanks `@cwitty`_ for the report and `@nicoddemus`_ for the PR.
@@ -35,10 +33,6 @@
 * Clean up unittest TestCase objects after tests are complete (`#1649`_).
   Thanks `@d_b_w`_ for the report and PR.
 
-*
-
-*
-
 
 .. _@adborden: https://github.com/adborden
 .. _@cwitty: https://github.com/cwitty
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index b070c40d1..97cf2527b 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '3.0.4.dev0'
+__version__ = '3.0.4'
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 9cb4527ad..a1bf7bed7 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
    
+   release-3.0.4
    release-3.0.3
    release-3.0.2
    release-3.0.1
diff --git a/doc/en/announce/release-3.0.4.rst b/doc/en/announce/release-3.0.4.rst
new file mode 100644
index 000000000..852057037
--- /dev/null
+++ b/doc/en/announce/release-3.0.4.rst
@@ -0,0 +1,29 @@
+pytest-3.0.4
+============
+
+pytest 3.0.4 has just been released to PyPI.
+
+This release fixes some regressions and bugs reported in the last version, 
+being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+  
+The changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Bruno Oliveira
+* Dan Wandschneider
+* Florian Bruhin
+* Georgy Dyuldin
+* Grigorii Eremeev
+* Jason R. Coombs
+* Manuel Jacob
+* Mathieu Clabaut
+* Michael Seifert
+* Nikolaus Rath
+* Ronny Pfannschmidt
+* Tom V
+
+Happy testing,
+The pytest Development Team