diff --git a/ChangeLog b/ChangeLog
index fe96ea3c6..afab21e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-10  Nicola Pero <n.pero@mi.flashnet.it>
+
+	* Headers/AppKit/AppKitDefines.h (GS_EXPORT): Use extern, not
+	__declspec(dllexport), on mingw
+	
 2005-03-10  Nicola Pero <n.pero@mi.flashnet.it>
 
 	* configure.ac: Fixed setting variable when libjpeg can't be found.
diff --git a/Headers/AppKit/AppKitDefines.h b/Headers/AppKit/AppKitDefines.h
index 09219e946..116239707 100644
--- a/Headers/AppKit/AppKitDefines.h
+++ b/Headers/AppKit/AppKitDefines.h
@@ -27,8 +27,17 @@
 #ifdef GNUSTEP_WITH_DLL 
 
 #if BUILD_libgnustep_gui_DLL
+#
+# if defined(__MINGW32__)
+  /* On Mingw, the compiler will export all symbols automatically, so
+   * __declspec(dllexport) is not needed.
+   */
+#  define APPKIT_EXPORT  extern
+#  define APPKIT_DECLARE 
+# else
 #  define APPKIT_EXPORT  __declspec(dllexport)
 #  define APPKIT_DECLARE __declspec(dllexport)
+# endif
 #else
 #  define APPKIT_EXPORT  extern __declspec(dllimport)
 #  define APPKIT_DECLARE __declspec(dllimport)