diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 734ff6e2a8..52c16926c2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,11 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+
+2003-04-14 14:45 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+  * source/common/hbgete.c
+    ! Added #ifdef to allow OS/2 GCC to use PSZ and OS/2 VAC++ to use PCSZ for EnvValue.
+
 2003-04-13 10:23 UTC+0200 Tomaz Zupan <tomaz.zupan@orpo.si>
   * contrib/odbc/todbc.prg
     ! Better way to move to first record after fetching
diff --git a/harbour/source/common/hbgete.c b/harbour/source/common/hbgete.c
index ca06b5c947..46d30684c3 100644
--- a/harbour/source/common/hbgete.c
+++ b/harbour/source/common/hbgete.c
@@ -84,7 +84,11 @@ char * hb_getenv( const char * szName )
 #elif defined(HB_OS_OS2)
 
    {
+   #ifdef __GNUC__
+      PSZ EnvValue = "";
+   #else
       PCSZ EnvValue = "";
+   #endif
 
       if( DosScanEnv( szName, &EnvValue ) == NO_ERROR )
       {