diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index aba675b038..5831f2341b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+2001-28-02 23:41 GMT+1 JFL (Mafact) <jfl@mafact.com>
+   *harbour/include/hb_class.ch
+    * Reset :Class within the control of Class(y) define
+      so as anyone can disable it as needed.
+
+
 2001-02-28 00:05 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * source/rtl/filesys.c
      * Temporarily changed all #if defined(__WIN32__) to #if defined(X__WIN32__) to disable
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index 457d0c8b34..3f41b744d9 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -166,8 +166,11 @@ DECLARE TClass ;
 
 /* Disable the message :Class */
 #ifndef HB_CLS_ALLOWCLASS
+/* CLASSY SYNTAX */
+#IFDEF HB_CLS_CSY
 #xtranslate  :CLASS  =>
 #xtranslate  :CLASS: => :
+endif
 #endif
 
 /* CLASSY SYNTAX */