diff --git a/ChangeLog b/ChangeLog
index 03bfc50..f6abd6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+=== release 0.9.6 ===
+
+2005-11-23  Thomas Vander Stichele <thomas at apestaart dot org>
+
+	* configure.ac:
+	  releasing 0.9.6, "Always On Time"
+
 2005-11-23  Wim Taymans  <wim@fluendo.com>
 
 	* docs/gst/gstreamer-sections.txt:
@@ -207,14 +214,14 @@
 	* gst/gstutils.c: (gst_util_set_object_arg):
 	* tools/gst-compprep.c: (main):
 	* tools/gst-inspect.c: (print_element_properties_info):
-	Removed GstURI , closes bug #321061
+	Removed GstURI, closes bug #321061
 
 2005-11-22  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* check/gst/gststructure.c: (GST_START_TEST):
 	* gst/gststructure.c: (gst_structure_parse_value):
-        Oops, broke automatic string type parsing.
-	Add a test to catch it in future.
+	  Oops, broke automatic string type parsing.
+	  Add a test to catch it in future.
 
 2005-11-22  Andy Wingo  <wingo@pobox.com>
 
@@ -825,7 +832,7 @@
 	* gst/gstclock.c: (gst_clock_set_calibration),
 	(gst_clock_get_calibration):
 	Doc and API fixes.
-	Callibration can be set with internal time equal to current
+	Calibration can be set with internal time equal to current
 	internal time too.
 
 2005-11-18  Thomas Vander Stichele  <thomas at apestaart dot org>
@@ -1118,7 +1125,7 @@
 2005-11-16  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/elements/gsttee.c: (gst_tee_init):
-	  fix pad tempalte leak in tee
+	  fix pad template leak in tee
 
 2005-11-16  Thomas Vander Stichele  <thomas at apestaart dot org>
 
diff --git a/NEWS b/NEWS
index ac05f63..a4675f7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,56 @@
-This is GStreamer 0.9.5, "Bike Lunch Day".
+This is GStreamer 0.9.6, "Always On Time".
+
+Changes since 0.9.5:
+    
+      * API changes and clean-up
+      * Extensive documentation updates
+      * remove GLib 2.4 compatibility
+      * added clock selection
+      * added network clocking
+      * added fd:// URI handler
+      * added more fraction functionality
+
+Bugs fixed since 0.9.5:
+    
+      * 143472 : [api] gst_tag_list_foreach() takes a non-const GstTagList*
+      * 156633 : [API] don't use same API for arrays as for normal lists
+      * 164168 : circular pipeline fails to negotiate
+      * 165650 : [API] gst_value_deserialize doesn't work correctly for NU...
+      * 168438 : [API] GstIndexFilter doesn't receive user_data
+      * 168494 : [API] gst_index_add_object() does nothing
+      * 305291 : Obnoxious bug-filing request
+      * 311489 : Possible gstghostpad locking problems
+      * 319178 : [API] finish filler events and support them in GstCollect...
+      * 319388 : 0.9 API changes tracker
+      * 319389 : state change updates obsolete some functions
+      * 319392 : GstEventType is not bindings-friendly
+      * 319395 : Macro name/visibility API bugs
+      * 319940 : Use GLIB macros for GCC extensions
+      * 320060 : add a CORE error category for missing ELEMENTS/PLUGINS
+      * 320097 : GST_BUFFER_FLAG_ORIGINAL should die
+      * 320113 : [API] duration message changes
+      * 320299 : gst_pad_send_event should take stream lock for serialized...
+      * 320324 : [API] GST_FOURCC_FORMAT should drop leading '%'
+      * 320423 : [API] padding for GstCollectData
+      * 320766 : [API] collect pads API changes
+      * 321061 : GstURI not used
+      * 321235 : [API] GST_PAD_IS_USABLE should be removed
+      * 321386 : [SEGFAULT] basetransform when doing reverse caps negotiation
+      * 321452 : GstPad's " template " property is b0rked
+      * 321528 : capsfilter: assertion `caps != NULL' failed
+      * 321595 : GstBin doesn't clean the message queue when changing stat...
+      * 321638 : Don't use // style comments in headers
+      * 321648 : Wrong type check in gst_message_parse_clock_lost
+      * 321710 : GstClock resolution functions should take a GstClockTime
+      * 321712 : GstClock adjust function changes
+      * 321875 : gst_plugin_check_file disappeared
+      * 321950 : gst_registry_scan_paths lacks implementation
+      * 321962 : [easyfix] gst_value_is_fixed uses gst_value_list_* on GST...
+      * 322027 : [API] Rename gst_caps_structure_fixate_* to gst_structure...
+      * 322034 : Elements should be updated not to take the stream lock in...
+      * 322069 : Names of GstTagSetter methods should be more descriptive
+      * 322134 : API master/slave clocks
+      * 322139 : our elements are confused about GEnumValue and which is t...
   
 Changes since 0.9.4:
     
diff --git a/RELEASE b/RELEASE
index 9ce9dc6..3b86bd6 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,5 +1,5 @@
 
-GStreamer: Release notes for GStreamer 0.9.5 "Bike Lunch Day"
+GStreamer: Release notes for GStreamer 0.9.6 "Always On Time"
         
 
 The GStreamer team is petrified to announce a new release
@@ -36,15 +36,55 @@
     
       * Parallel installability with 0.8.x series
       * Threadsafe design and API
-      * gst_bus_poll and signal watch now see the same messages
-      * clock sync in BaseSrc class
-      * API documentation updates
-      * Bus reworked; signal API added
+      * API changes and clean-up
+      * Extensive documentation updates
+      * remove GLib 2.4 compatibility
+      * added clock selection
+      * added network clocking
+      * added fd:// URI handler
+      * added more fraction functionality
 
 Bugs fixed in this release
     
-      * 317341 : after linking ghost pads, one target pad does not have a ...
-      * 320774 : basesrc commit broke typefinding
+      * 143472 : [api] gst_tag_list_foreach() takes a non-const GstTagList*
+      * 156633 : [API] don't use same API for arrays as for normal lists
+      * 164168 : circular pipeline fails to negotiate
+      * 165650 : [API] gst_value_deserialize doesn't work correctly for NU...
+      * 168438 : [API] GstIndexFilter doesn't receive user_data
+      * 168494 : [API] gst_index_add_object() does nothing
+      * 305291 : Obnoxious bug-filing request
+      * 311489 : Possible gstghostpad locking problems
+      * 319178 : [API] finish filler events and support them in GstCollect...
+      * 319388 : 0.9 API changes tracker
+      * 319389 : state change updates obsolete some functions
+      * 319392 : GstEventType is not bindings-friendly
+      * 319395 : Macro name/visibility API bugs
+      * 319940 : Use GLIB macros for GCC extensions
+      * 320060 : add a CORE error category for missing ELEMENTS/PLUGINS
+      * 320097 : GST_BUFFER_FLAG_ORIGINAL should die
+      * 320113 : [API] duration message changes
+      * 320299 : gst_pad_send_event should take stream lock for serialized...
+      * 320324 : [API] GST_FOURCC_FORMAT should drop leading '%'
+      * 320423 : [API] padding for GstCollectData
+      * 320766 : [API] collect pads API changes
+      * 321061 : GstURI not used
+      * 321235 : [API] GST_PAD_IS_USABLE should be removed
+      * 321386 : [SEGFAULT] basetransform when doing reverse caps negotiation
+      * 321452 : GstPad's " template " property is b0rked
+      * 321528 : capsfilter: assertion `caps != NULL' failed
+      * 321595 : GstBin doesn't clean the message queue when changing stat...
+      * 321638 : Don't use // style comments in headers
+      * 321648 : Wrong type check in gst_message_parse_clock_lost
+      * 321710 : GstClock resolution functions should take a GstClockTime
+      * 321712 : GstClock adjust function changes
+      * 321875 : gst_plugin_check_file disappeared
+      * 321950 : gst_registry_scan_paths lacks implementation
+      * 321962 : [easyfix] gst_value_is_fixed uses gst_value_list_* on GST...
+      * 322027 : [API] Rename gst_caps_structure_fixate_* to gst_structure...
+      * 322034 : Elements should be updated not to take the stream lock in...
+      * 322069 : Names of GstTagSetter methods should be more descriptive
+      * 322134 : API master/slave clocks
+      * 322139 : our elements are confused about GEnumValue and which is t...
 
 Download
 
@@ -86,14 +126,17 @@
   
 Contributors to this release
     
+      * Alessandro Dessina
       * Andy Wingo
+      * Daniel Fischer
       * Edward Hervey
+      * Jan Schmidt
       * Johan Dahlin
       * Julien MOUTTE
-      * Luca Ognibene
       * Michael Smith
       * Stefan Kost
       * Thomas Vander Stichele
       * Tim-Philipp Müller
+      * Torsten Schoenfeld
       * Wim Taymans
  
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index a9bbbe9..ae203fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gstreamer, GST_VERSION, 0, 9, 5, 1,
+AS_VERSION(gstreamer, GST_VERSION, 0, 9, 6, 0,
     GST_CVS="no", GST_CVS="yes")
 
 dnl can autoconf find the source ?
@@ -38,7 +38,7 @@
 dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
 dnl sets GST_LT_LDFLAGS
-AS_LIBTOOL(GST, 7, 0, 0)
+AS_LIBTOOL(GST, 8, 0, 0)
 AS_LIBTOOL_TAGS
 AM_PROG_LIBTOOL
 
diff --git a/docs/random/moving-plugins b/docs/random/moving-plugins
index 4540006..7c0ed14 100644
--- a/docs/random/moving-plugins
+++ b/docs/random/moving-plugins
@@ -86,3 +86,7 @@
 
 - Decision should be made if it should go into good (LGPL license,
   LGPL dependencies, no patent issues) or ugly
+
+- plugin documentation needs to be added:
+  - "make update" in docs/plugins and commit the new file
+  - edit -docs.sgml and add an include for the file
diff --git a/win32/common/config.h b/win32/common/config.h
index 7ea830f..aa69283 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -21,7 +21,7 @@
 #undef GST_GCOV_ENABLED
 
 /* Default errorlevel to use */
-#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR
+#define GST_LEVEL_DEFAULT GST_LEVEL_NONE
 
 /* GStreamer license */
 #define GST_LICENSE "LGPL"
@@ -30,10 +30,10 @@
 #define GST_PACKAGE_ORIGIN "Unknown package origin"
 
 /* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer CVS/prerelease"
+#define GST_PACKAGE_NAME "GStreamer source release"
 
 /* Define the version */
-#define GST_VERSION "0.9.5.1"
+#define GST_VERSION "0.9.6"
 
 /* Define if the host CPU is an Alpha */
 #undef HAVE_CPU_ALPHA
@@ -205,7 +205,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "0.9.5.1"
+#define VERSION "0.9.6"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */