diff --git a/CREDITS b/CREDITS
index 162aa2ef9..42e3215a7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,36 @@
 =======
 CREDITS
 =======
+
+Version 2.0.0
+-------------
+Welcome to Yuchen Wang!
+
+Naomi Aro (naomi.aro@sourcefabric.org)
+  Role: Software Developer
+
+Martin Konecny (martin.konecny@sourcefabric.org)
+  Role: Software Developer
+
+James Moon (james.moon@sourcefabric.org)
+  Role: Software Developer
+  
+Yuchen Wang (yuchen.wang@sourcefabric.org)
+  Role: Software Developer
+
+Ofir Gal (ofir.gal@sourcefabric.org)
+  Role: QA
+
+Daniel James
+  Role: Documentor & QA
+
+Paul Baranowski (paul.baranowski@sourcefabric.org)
+  Role: Project Manager
+
+Vladimir Stefanovic (vladimir.stefanovic@sourcefabric.org)
+  Role: User Interface Designer
+
+
 Version 1.9.5
 -------------
 Same as previous version.
diff --git a/changelog b/changelog
index f7f87c1f3..69e0eaca9 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+2.0.0 - Nov 28, 2011
+  * CC-1942: Add ability to set timezone in preferences
+  * CC-2363: Diagnostic screen in Web UI
+  * CC-2438: Add a button to listen to the stream immediately
+  * CC-2591: Allow upload of any audio clip to Soundcloud
+  * CC-2607: Ability to adjust stream bitrate, type, etc from the UI interface
+  * CC-2630: Allow Liquidsoap to support multiple streams
+  * CC-2950: Tell users if they are running an out-of-date version or not
+  * CC-2959: Stream Setting: Status box design for each stream
+
 1.9.5 - Nov 2, 2011
   *(CC-2743, CC-2769) Fixed problem where Media-Monitor would try to parse a file's metadata while the OS was still copying it
   *(CC-2882) Fixed a bug where a couldn't unregister an old directory name from Airtime after it was renamed.