diff --git a/ChangeLog b/ChangeLog
index 732389aef8..66591686ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-05  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Vincent Torri  <vtorri at univ-evry dot fr>
+
+	* gst/gst_private.h:
+	* gst/gstconfig.h.in:
+	* gst/gstinfo.h:
+	  On win32, all the __declspec stuff for symbol exporting is
+	  apparently only needed with MSVC, but doesn't work with MingW.
+	  Fixes compilation with MingW and #391909.
+
 2007-01-05  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* libs/gst/base/gstbasesrc.c: (gst_base_src_activate_push):
diff --git a/gst/gst_private.h b/gst/gst_private.h
index 2b8b4aca3c..3d778f68aa 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -55,9 +55,9 @@ void _priv_gst_registry_cleanup (void);
 
 #ifndef GST_DISABLE_GST_DEBUG
 
-#ifndef WIN32
+#ifndef _MSC_VER
 #define IMPORT_SYMBOL
-#else
+#else /* _MSC_VER */
 #ifndef LIBGSTREAMER_EXPORTS
 #define IMPORT_SYMBOL __declspec(dllimport)
 #else
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index e4aa10f258..a465d42ec3 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -191,14 +191,14 @@
  * On Windows, this exports the plugin definition from the DLL.
  * On other platforms, this gets defined as a no-op.
  */
-#if defined(WIN32) && (!defined(__MINGW32__))
+#ifdef _MSC_VER
 #define GST_PLUGIN_EXPORT __declspec(dllexport) extern
 #ifdef GST_EXPORTS
 #define GST_EXPORT __declspec(dllexport) extern
 #else
 #define GST_EXPORT __declspec(dllimport) extern
 #endif
-#else /* not WIN32 */
+#else /* not _MSC_VER */
 #define GST_PLUGIN_EXPORT
 #define GST_EXPORT extern
 #endif
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 57caa6a921..3a941b2d0b 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -321,9 +321,9 @@ void            gst_debug_unset_threshold_for_name  (const gchar * name);
  * Declares a GstDebugCategory variable as extern. Use in header files.
  * This macro expands to nothing if debugging is disabled.
  */
-#ifndef WIN32
+#ifndef _MSC_VER
 #define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat
-#else
+#else /* _MSC_VER */
 #define GST_DEBUG_CATEGORY_EXTERN(cat) \
   extern __declspec (dllimport) GstDebugCategory *cat;
 #endif