diff --git a/CHANGELOG.md b/CHANGELOG.md
index e60566250..5de081262 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 Changelog
 =========
 
+3.0.4
+-----
+
+Changes:
+ - Various cleanups
+ - Deprecated using `--router` instead use `--database`
+ - Locales: Indonesian and Polish, updated
+ - Improvement: show_dsn, fix crash with django-postgres-extra
+ - Improvement: print_settings, added wildcard support
+ - Improvement: print_settings, added --fail option
+ - Improvement: delete_squashed_migrations, add --database option
+ - Improvement: runserver_plus, added RUNSERVER_PLUS_EXTRA_FILES setting
+ - Improvement: runserver_plus, added runserver_plus_started signal
+
+
 3.0.3
 -----
 
diff --git a/django_extensions/__init__.py b/django_extensions/__init__.py
index 674583e92..c9bec4471 100644
--- a/django_extensions/__init__.py
+++ b/django_extensions/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (3, 0, 4, 'DEV')
+VERSION = (3, 0, 4)
 
 
 def get_version(version):
diff --git a/docs/conf.py b/docs/conf.py
index 0ae928571..aa5388b0d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '3.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.3'
+release = '3.0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.