diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8dc57fb9f5..811ff5289d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2001-12-20 13:14 UTC+0000 Dave Pearson <davep@davep.org>
+   * include/hbdefs.h
+     * Added "&& defined( HB_OS_WIN_32 )" to the #elif that tests for
+       __GNUC__ when deciding how to #define HB_EXPORT.
+	
 2001-12-20 13:53 UTC+0100 Antonio Linares <alinares@fivetech.com>
    * include/hbdefs.h
      * HB_EXPORT definition for Borland C
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 1123b0878c..f5cc41ed6a 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -194,7 +194,7 @@ typedef PHB_FUNC HB_FUNC_PTR;
 #if defined( __RSXNT__ )
    #define HB_EXPORT _export
 
-#elif defined( __GNUC__ )
+#elif defined( __GNUC__ ) && defined( HB_OS_WIN_32 )
    #define HB_EXPORT __attribute__ (( dllexport ))
 
 #elif defined( __BORLANDC__ )
@@ -253,4 +253,4 @@ typedef BYTE HB_ATTR;
 #define HB_CHAR_SOFT1           ( ( char ) 141 )
 #define HB_CHAR_SOFT2           ( ( char ) HB_CHAR_LF )
 
-#endif /* HB_DEFS_H_ */
\ No newline at end of file
+#endif /* HB_DEFS_H_ */