diff --git a/ChangeLog b/ChangeLog
index 67df194e2c..de16c5ad36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-09  Steve Lhomme  <steve.lhomme@free.fr>
+
+	* win32/config.h:
+	* win32/gstversion.h:
+	  enable NLS again, push the version number for the coming 0.8.5 release
+
+2004-08-09  Steve Lhomme  <steve.lhomme@free.fr>
+
+	* gst/gstvalue.h:
+	  export gst_type_XXX for windows DLLs
+
 2004-08-09  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* docs/faq/gst-uninstalled:
diff --git a/gst/gstvalue.h b/gst/gstvalue.h
index 9f38e8e258..9bd0e7969b 100644
--- a/gst/gstvalue.h
+++ b/gst/gstvalue.h
@@ -80,12 +80,12 @@ struct _GstValueTable {
   void *_gst_reserved [GST_PADDING];
 };
 
-extern GType gst_type_fourcc;
-extern GType gst_type_int_range;
-extern GType gst_type_double_range;
-extern GType gst_type_list;
-extern GType gst_type_fixed_list;
-extern GType gst_type_fraction;
+GST_EXPORT GType gst_type_fourcc;
+GST_EXPORT GType gst_type_int_range;
+GST_EXPORT GType gst_type_double_range;
+GST_EXPORT GType gst_type_list;
+GST_EXPORT GType gst_type_fixed_list;
+GST_EXPORT GType gst_type_fraction;
 
 void		gst_value_register		(const GstValueTable   *table);
 void		gst_value_init_and_copy		(GValue                *dest,
diff --git a/win32/config.h b/win32/config.h
index 3b9e6b2929..6867d030be 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -2,7 +2,7 @@
 
 /* always defined to indicate that i18n is enabled */
 /*#define ENABLE_NLS 1*/
-#undef ENABLE_NLS
+#define ENABLE_NLS 1
 
 /* gettext package name */
 #define GETTEXT_PACKAGE "gstreamer-0.8"
@@ -29,7 +29,7 @@
 #define GST_PACKAGE "GStreamer"
 
 /* Define the version */
-#define GST_VERSION "0.8.4"
+#define GST_VERSION "0.8.5"
 
 /* Define the release version */
 #define GST_VERSION_RELEASE "20040129_103536"
@@ -190,7 +190,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "0.8.4.0"
+#define VERSION "0.8.5.0"
 
 /* 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/gstversion.h b/win32/gstversion.h
index efe80cd9ee..8baea0394f 100644
--- a/win32/gstversion.h
+++ b/win32/gstversion.h
@@ -32,7 +32,7 @@
  */
 #define GST_VERSION_MAJOR 0
 #define GST_VERSION_MINOR 8
-#define GST_VERSION_MICRO 1
+#define GST_VERSION_MICRO 5
 
 void    gst_version     (guint *major, guint *minor, guint *micro);