diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2409422e8a..6c376cfd8e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-23 10:00 UTC+0800 Ron Pinkas <ron@profit-master.com>
+   * include/hbclass.ch
+     * Changed AS ... from ALL CAPS to Capitalized, to avoid conflict with FWH #defines, for those not using modified DLL.CH
+
 2000-09-23 15:55 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
    *contrib/mysql/tmysql.prg
       ! a couple of little fixes.
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index 20c2a711c7..b552c2ee66 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -49,15 +49,15 @@
  */
 
 DECLARE TClass ;
-        New( cName AS STRING, OPTIONAL SuperParams ) AS CLASS TClass ;
-        Create() AS OBJECT;
-        Instance() AS OBJECT ;
-        AddClsMthds( cName AS STRING, @MethodName(), nScope AS NUMERIC, n2 AS NUMERIC, n3 AS NUMERIC );
-        AddMultiClsData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
-        AddMultiData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
-        AddMethod( cName AS STRING, @MethodName(), nScope AS NUMERIC );
-        AddInLine( cName AS STRING, bBlock AS CODEBLOCK, nScope AS NUMERIC );
-        AddVirtual( cName AS STRING )
+        New( cName AS String, OPTIONAL SuperParams ) AS CLASS TClass ;
+        Create() AS Object;
+        Instance() AS Object ;
+        AddClsMthds( cName AS String, @MethodName(), nScope AS Numeric, n2 AS Numeric, n3 AS Numeric );
+        AddMultiClsData( cType AS String, uVal, nScope AS Numeric, aDatas AS Array OF String );
+        AddMultiData( cType AS String, uVal, nScope AS Numeric, aDatas AS Array OF String );
+        AddMethod( cName AS String, @MethodName(), nScope AS Numeric );
+        AddInLine( cName AS String, bBlock AS CodeBlock, nScope AS Numeric );
+        AddVirtual( cName AS String )
 
 #ifndef HB_CLASS_CH_
 #define HB_CLASS_CH_