diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4735bd5cfd..4604b74b56 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000507-23:30 CET Patrick Mast <harbour@PatrickMast.com>
+
+   * source/compiler/cmdcheck.c
+     + Added -? and -h option for the compiler.
+       these options shouw the Harbour usage page.
+
 20000507-13:35 GMT-8 Ron Pinkas <Ron@Profit-Master.com>
 
    * include/hberrors.h
diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c
index 41f48084e2..b074a815d5 100644
--- a/harbour/source/compiler/cmdcheck.c
+++ b/harbour/source/compiler/cmdcheck.c
@@ -187,6 +187,9 @@ void hb_compChkEnvironVar( char * szSwitch )
          s++;
          switch( *s )
          {
+             case '?':
+                break;
+
              case 'a':
              case 'A':
                 hb_comp_bAutoMemvarAssume = TRUE;
@@ -316,6 +319,13 @@ void hb_compChkEnvironVar( char * szSwitch )
                 }
                 break;
 
+               /* NOTE:
+                  h or H from HELP or help
+               */
+             case 'h':
+             case 'H':
+                break;
+
                /* NOTE:
                   It already has support for several include files
                */