diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 087064abdd..6009ed20aa 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-01 22:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbodbc/odbc.c
+    ! Added workaround for OpenWatcom (1.9) missing an entry for
+      SQLSetStmtAttr() function's wide version (SQLSetStmtAttrW),
+      while it has it properly present in the header.
+      The workaround will disable UNICODE for hbodbc lib when
+      built for win/watcom.
+      [ I'd appreciate if someone could report this problem
+      upstream. ]
+
 2011-02-01 20:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/hbnetioq/netiosrq.prg
     ! Fixed casing in #include lines.
@@ -60,7 +70,7 @@
            gtwvg dll:
               Error! E2028: IID_IPicture is an undefined reference
            and hbodbc dll:
-              Error! E2028: _SQLSetStmtAttrW@16 is an undefined reference
+              Error! E2028: _SQLSetStmtAttrW@16 is an undefined reference [DONE]
            Any idea?
 
 2011-02-01 16:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/hbodbc/odbc.c b/harbour/contrib/hbodbc/odbc.c
index 9f97f6928c..8f4442d20f 100644
--- a/harbour/contrib/hbodbc/odbc.c
+++ b/harbour/contrib/hbodbc/odbc.c
@@ -80,6 +80,16 @@
 
 /* Required by headers on Windows */
 #if defined( HB_OS_WIN )
+
+   /* NOTE: Workaround for OpenWatcom's (tested with 1.9) odbc32.lib implib
+            missing the entry for wide version of one function,
+            so we turn off UNICODE, until its fixed in OpenWatcom:
+               Error! E2028: _SQLSetStmtAttrW@16 is an undefined reference
+            [vszakats] */
+#  if defined( __WATCOMC__ ) && defined( UNICODE )
+#     undef UNICODE
+#  endif
+
 #  include <windows.h>
    /* Required for WIN32_LEAN_AND_MEAN mode */
 #  if ! defined( WIN32 )