diff --git a/ChangeLog b/ChangeLog
index 4f50475f1f..d19fa73bad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-13  Michael Smith <msmith@fluendo.com>
+
+	* gst/gstconfig.h.in:
+	  Don't Use windows linking attributes for MinGW. Fixes #316157
+
 2005-09-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstutils.c: (set_state_async_thread_func),
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index 519d7be737..0647d5407f 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -136,7 +136,7 @@
  * On Windows, this exports the plugin definition from the DLL.
  * On other platforms, this gets defined as a no-op.
  */
-#ifdef WIN32
+#if defined(WIN32) && (!defined(__MINGW32__))
 #define GST_PLUGIN_EXPORT __declspec(dllexport) extern
 #ifdef GST_EXPORTS
 #define GST_EXPORT __declspec(dllexport) extern