diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
index de36165b56c1..afd8f8177fe3 100644
--- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.6.0
+-----
+
+ * [BC BREAK] changed exception.json.twig to match same structure as error.json.twig making clients independent of runtime environment.
+
 2.3.0
 -----
 
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig
index 042e082b598a..13a41476f2a7 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig
@@ -1 +1 @@
-{{ exception.toarray|json_encode|raw }}
+{{ { 'error': { 'code': status_code, 'message': status_text, 'exception': exception.toarray } }|json_encode|raw }}