diff --git a/ChangeLog b/ChangeLog
index 1fbf774222..33b968a130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-26  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* win32/common/config.h:
+	* win32/common/gstenumtypes.c:
+	* win32/common/gstenumtypes.h:
+	* win32/common/gstversion.h:
+	  Update win32 files.
+
 2008-06-26  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* gst/gstdebugutils.h: (GstDebugGraphDetails),
diff --git a/win32/common/config.h b/win32/common/config.h
index d184975f82..8ba7d14fde 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_NONE
+#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR
 
 /* GStreamer license */
 #define GST_LICENSE "LGPL"
@@ -30,7 +30,7 @@
 #define GST_MAJORMINOR "0.10"
 
 /* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer source release"
+#define GST_PACKAGE_NAME "GStreamer CVS/prerelease"
 
 /* package origin */
 #define GST_PACKAGE_ORIGIN "Unknown package origin"
@@ -194,13 +194,13 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 0.10.20"
+#define PACKAGE_STRING "GStreamer 0.10.20.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.20"
+#define PACKAGE_VERSION "0.10.20.1"
 
 /* Define the plugin directory */
 #ifdef _DEBUG
@@ -216,7 +216,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "0.10.20"
+#define VERSION "0.10.20.1"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c
index 14c1d4f96a..c8f0249df7 100644
--- a/win32/common/gstenumtypes.c
+++ b/win32/common/gstenumtypes.c
@@ -504,6 +504,9 @@ register_gst_stream_error (GType * id)
     {C_ENUM (GST_STREAM_ERROR_DEMUX), "GST_STREAM_ERROR_DEMUX", "demux"},
     {C_ENUM (GST_STREAM_ERROR_MUX), "GST_STREAM_ERROR_MUX", "mux"},
     {C_ENUM (GST_STREAM_ERROR_FORMAT), "GST_STREAM_ERROR_FORMAT", "format"},
+    {C_ENUM (GST_STREAM_ERROR_DECRYPT), "GST_STREAM_ERROR_DECRYPT", "decrypt"},
+    {C_ENUM (GST_STREAM_ERROR_DECRYPT_NOKEY), "GST_STREAM_ERROR_DECRYPT_NOKEY",
+        "decrypt-nokey"},
     {C_ENUM (GST_STREAM_ERROR_NUM_ERRORS), "GST_STREAM_ERROR_NUM_ERRORS",
         "num-errors"},
     {0, NULL, NULL}
@@ -1248,6 +1251,7 @@ register_gst_query_type (GType * id)
     {C_ENUM (GST_QUERY_SEGMENT), "GST_QUERY_SEGMENT", "segment"},
     {C_ENUM (GST_QUERY_CONVERT), "GST_QUERY_CONVERT", "convert"},
     {C_ENUM (GST_QUERY_FORMATS), "GST_QUERY_FORMATS", "formats"},
+    {C_ENUM (GST_QUERY_BUFFERING), "GST_QUERY_BUFFERING", "buffering"},
     {0, NULL, NULL}
   };
   *id = g_enum_register_static ("GstQueryType", values);
@@ -1262,6 +1266,28 @@ gst_query_type_get_type (void)
   g_once (&once, (GThreadFunc) register_gst_query_type, &id);
   return id;
 }
+static void
+register_gst_buffering_mode (GType * id)
+{
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_BUFFERING_STREAM), "GST_BUFFERING_STREAM", "stream"},
+    {C_ENUM (GST_BUFFERING_DOWNLOAD), "GST_BUFFERING_DOWNLOAD", "download"},
+    {C_ENUM (GST_BUFFERING_TIMESHIFT), "GST_BUFFERING_TIMESHIFT", "timeshift"},
+    {C_ENUM (GST_BUFFERING_LIVE), "GST_BUFFERING_LIVE", "live"},
+    {0, NULL, NULL}
+  };
+  *id = g_enum_register_static ("GstBufferingMode", values);
+}
+
+GType
+gst_buffering_mode_get_type (void)
+{
+  static GType id;
+  static GOnce once = G_ONCE_INIT;
+
+  g_once (&once, (GThreadFunc) register_gst_buffering_mode, &id);
+  return id;
+}
 
 /* enumerations from "gsttaglist.h" */
 static void
@@ -1440,5 +1466,26 @@ gst_parse_error_get_type (void)
   g_once (&once, (GThreadFunc) register_gst_parse_error, &id);
   return id;
 }
+static void
+register_gst_parse_flags (GType * id)
+{
+  static const GFlagsValue values[] = {
+    {C_FLAGS (GST_PARSE_FLAG_NONE), "GST_PARSE_FLAG_NONE", "none"},
+    {C_FLAGS (GST_PARSE_FLAG_FATAL_ERRORS), "GST_PARSE_FLAG_FATAL_ERRORS",
+        "fatal-errors"},
+    {0, NULL, NULL}
+  };
+  *id = g_flags_register_static ("GstParseFlags", values);
+}
+
+GType
+gst_parse_flags_get_type (void)
+{
+  static GType id;
+  static GOnce once = G_ONCE_INIT;
+
+  g_once (&once, (GThreadFunc) register_gst_parse_flags, &id);
+  return id;
+}
 
 /* Generated data ends here */
diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h
index 5640ede55c..670729215b 100644
--- a/win32/common/gstenumtypes.h
+++ b/win32/common/gstenumtypes.h
@@ -147,6 +147,8 @@ GType gst_rank_get_type (void);
 /* enumerations from "gstquery.h" */
 GType gst_query_type_get_type (void);
 #define GST_TYPE_QUERY_TYPE (gst_query_type_get_type())
+GType gst_buffering_mode_get_type (void);
+#define GST_TYPE_BUFFERING_MODE (gst_buffering_mode_get_type())
 
 /* enumerations from "gsttaglist.h" */
 GType gst_tag_merge_mode_get_type (void);
@@ -173,6 +175,8 @@ GType gst_uri_type_get_type (void);
 /* enumerations from "gstparse.h" */
 GType gst_parse_error_get_type (void);
 #define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type())
+GType gst_parse_flags_get_type (void);
+#define GST_TYPE_PARSE_FLAGS (gst_parse_flags_get_type())
 G_END_DECLS
 
 #endif /* __GST_ENUM_TYPES_H__ */
diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h
index 2f35846e0f..243c92130e 100644
--- a/win32/common/gstversion.h
+++ b/win32/common/gstversion.h
@@ -57,7 +57,7 @@ G_BEGIN_DECLS
  *
  * The micro version of GStreamer at compile time:
  */
-#define GST_VERSION_MICRO (14)
+#define GST_VERSION_MICRO (20)
 /**
  * GST_VERSION_NANO:
  *
@@ -66,6 +66,23 @@ G_BEGIN_DECLS
  */
 #define GST_VERSION_NANO (1)
 
+/**
+ * GST_CHECK_VERSION:
+ * @major: a number indicating the major version
+ * @minor: a number indicating the minor version
+ * @micro: a number indicating the micro version
+ *
+ * Check whether a GStreamer version equal to or greater than
+ * major.minor.micro is present.
+ *
+ * Since: 0.10.18
+ */
+#define	GST_CHECK_VERSION(major,minor,micro)	\
+    (GST_VERSION_MAJOR > (major) || \
+     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \
+     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
+      GST_VERSION_MICRO >= (micro)))
+
 G_END_DECLS
 
 #endif /* __GST_VERSION_H__ */