diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5b1a0af..6b12f21 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+v0.4.0
+======
+Date: 2012-11-11
+
+CHANGED: Refactored tests to allow test runs with other apps. Includes a
+         "backport" of override_settings to ensure Django 1.3 support.
+         (thanks to Jacek Tomaszewski)
 CHANGED: Modeltranslation related css class prefix to 'mt'.
 
   FIXED: Race condition during initialization.
diff --git a/PKG-INFO b/PKG-INFO
index f56b623..80b5f97 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: django-modeltranslation
-Version: 0.4.0-beta2
+Version: 0.4.0
 Summary: Translates Django models using a registration approach.
 Home-page: https://github.com/deschler/django-modeltranslation
 Author: Peter Eschler,
diff --git a/modeltranslation/__init__.py b/modeltranslation/__init__.py
index 249f778..e84e699 100644
--- a/modeltranslation/__init__.py
+++ b/modeltranslation/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (0, 4, 0, 'beta', 2)
+VERSION = (0, 4, 0, 'final', 0)
 
 
 def get_version(version=None, pep386=True, short=False):
@@ -11,7 +11,7 @@ def get_version(version=None, pep386=True, short=False):
     will be used (e.g. 0.4.0-rc1).
 
     If the ``short`` parameter is ``True``, the release style naming version
-    will omit the patch level and sub (e.g. 0.4). The is for example used for
+    will omit the patch level and sub (e.g. 0.4). This is for example used for
     sphinx.
     """
     if version is None:
@@ -35,8 +35,10 @@ def get_version(version=None, pep386=True, short=False):
 
     if short:
         return '%d.%d'.format(version[0], version[1])
-    return '%d.%d.%d-%s%d' % (
-        version[0], version[1], version[2], version[3], version[4])
+    if version[3] != 'final':
+        return '%d.%d.%d-%s%d' % (
+            version[0], version[1], version[2], version[3], version[4])
+    return '%d.%d.%d' % (version[0], version[1], version[2])
 
 
 __version__ = get_version()