diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fa23247289..e634406635 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-30 23:02 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/gtwvg/Makefile
+    ! check HB_ARCHITECTURE=win before compiling GTWVG.
+      It fixes non Windows OpenWatcom and ICC builds.
+
 2009-03-30 22:17 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/dlmalloc.c
     ! fixed casting
diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile
index 9231d6717e..9b75ac1f2a 100644
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -9,6 +9,8 @@ ROOT = ../../
 LIBNAME=gtwvg
 
 ifeq ($(HB_WITH_GTWVG),)
+ifeq ($(HB_ARCHITECTURE),win)
+
 ifeq ($(HB_COMPILER),mingw)
 HB_WITH_GTWVG=yes
 endif
@@ -26,6 +28,8 @@ HB_WITH_GTWVG=yes
 endif
 ifeq ($(HB_COMPILER),bcc)
 HB_WITH_GTWVG=yes
+endif
+
 endif
 endif