diff --git a/ChangeLog b/ChangeLog
index 921816aff..fae9f3e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-19  Thomas Thurman  <tthurman@gnome.org>
+
+        * NEWS: 2.21.5 release.
+
 2007-12-19  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in: print "Subversion" and not "CVS".
diff --git a/NEWS b/NEWS
index c006d7daa..6aba5a257 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+2.21.5
+======
+
+Thanks to Iain Holmes and Thomas Thurman for improvements in this version.
+This contains the new compositor; downstream maintainers should note that
+its GConf key is initially turned off in src/metacity.schemas.in and consider
+whether to turn it on by default in their packages.
+
+  - merge compositor branch! (Iain) (499081)
+  - print "Subversion" and not "CVS" when building (Thomas)
+
+Translations
+  Jorge González (es), Kjartan Maraas (nb), Daniel Nylander (sv)
+
 2.21.3
 ======