diff --git a/ChangeLog b/ChangeLog
index ab6d4218b..6e1a0f30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-12  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[build] Expand dllexport/dllimport to Cygwin/MinGW.
+
+	* include/freetype/config/ftconfig.h: Respect DLL_EXPORT,
+	s/_MSC_VER/_WIN32/.
+	* builds/unix/ftconfig.in: Replicate here.
+	* builds/vms/ftconfig.h: Replicate here.
+
 2018-01-12  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	[build] Improve and document MSVC build.
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index 5159693e7..ca9058834 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -493,6 +493,17 @@ FT_BEGIN_HEADER
 #define FT_EXPORT( x )  extern  x
 #endif
 
+#ifdef _WIN32
+#if defined( FT2_BUILD_LIBRARY ) && \
+    ( defined( _DLL ) || defined( DLL_EXPORT ) )
+#undef FT_EXPORT
+#define FT_EXPORT( x )  __declspec( dllexport )  x
+#elif defined( FT2_DLLIMPORT )
+#undef FT_EXPORT
+#define FT_EXPORT( x )  __declspec( dllimport )  x
+#endif
+#endif
+
 #endif /* !FT_EXPORT */
 
 
diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h
index fa4aa1198..d87ea69c3 100644
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@@ -445,6 +445,17 @@ FT_BEGIN_HEADER
 #define FT_EXPORT( x )  extern  x
 #endif
 
+#ifdef _WIN32
+#if defined( FT2_BUILD_LIBRARY ) && \
+    ( defined( _DLL ) || defined( DLL_EXPORT ) )
+#undef FT_EXPORT
+#define FT_EXPORT( x )  __declspec( dllexport )  x
+#elif defined( FT2_DLLIMPORT )
+#undef FT_EXPORT
+#define FT_EXPORT( x )  __declspec( dllimport )  x
+#endif
+#endif
+
 #endif /* !FT_EXPORT */
 
 
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index 009c70f18..8ff143ea3 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -461,8 +461,9 @@ FT_BEGIN_HEADER
 #define FT_EXPORT( x )  extern  x
 #endif
 
-#ifdef _MSC_VER
-#if defined( FT2_BUILD_LIBRARY ) && defined( _DLL )
+#ifdef _WIN32
+#if defined( FT2_BUILD_LIBRARY ) && \
+    ( defined( _DLL ) || defined( DLL_EXPORT ) )
 #undef FT_EXPORT
 #define FT_EXPORT( x )  __declspec( dllexport )  x
 #elif defined( FT2_DLLIMPORT )