diff --git a/CREDITS b/CREDITS
index 2594f4dc5..02ff8e219 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,27 @@
 =======
 CREDITS
 =======
+
+Version 2.2.1
+-------------
+Martin Konecny (martin.konecny@sourcefabric.org)
+  Role: Developer Team Lead
+
+James Moon (james.moon@sourcefabric.org)
+  Role: Software Developer
+  
+Denise Rigato (denise.rigato@sourcefabric.org)
+  Role: Software Developer
+
+Cliff Wang (cliff.wang@sourcefabric.org)
+  Role: QA
+
+Mikayel Karapetian (michael.karapetian@sourcefabric.org)
+  Role: QA
+
+Daniel James (daniel.james@sourcefabric.org)
+  Role: Documentor & QA
+
 Version 2.2.0
 -------------
 Martin Konecny (martin.konecny@sourcefabric.org)
diff --git a/changelog b/changelog
index 123d71e5f..386670903 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+2.2.1 - December 4th, 2012
+  * Bug fixes
+    * Improved fades between webstreams
+	* Fix webstreams disconnecting occasionally
+	* Put 'and' and 'or' connectors between smart blocks
+	* Fix inability to preview webstreams in the Now Playing page on some
+	browsers
+	* Fix airtime-import script failing on FLAC files
+	* Fix DJ's being able to delete files they don't own
+	* Add support for 'x-scpls' webstream playlist types
+	* Fix media-monitor requiring a restart for initial import.
+
 2.2.0 - October 25th, 2012
   * New features
     * Smart Playlists