diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index baf6dbaaf8..e5afb9608c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+20000420-13:46 GMT+1 Ryszard Glab <rglab@imid.med.pl>
+
+   * source/compiler/genobj32.c
+     * Some little fixes after Antonio changes :)
+     NOTE:
+     JUMPSHORT uses 1 byte for jump offset
+     JUMP      uses 2 bytes 
+     JUMPFAR   uses 3 bytes
+     plus 1 byte for the opcode itself
+   
 20000420-13:10 GMT+1 Antonio Linares <alinares@fivetech.com>
    * source/compiler/genobj32.c
      * Some little fixes after Ryszard changes
diff --git a/harbour/source/compiler/genobj32.c b/harbour/source/compiler/genobj32.c
index 84c387958d..c20defc7f3 100644
--- a/harbour/source/compiler/genobj32.c
+++ b/harbour/source/compiler/genobj32.c
@@ -553,9 +553,9 @@ static void DataSegment( FILE * hObjFile, BYTE * symbol, ULONG wSymLen, ULONG wS
         {
            switch( pFunction->pCode[ w ] )
            {
-              case HB_P_JUMPFAR:
-              case HB_P_JUMPFARFALSE:
-              case HB_P_JUMPFARTRUE:
+              case HB_P_JUMPSHORT:
+              case HB_P_JUMPSHORTFALSE:
+              case HB_P_JUMPSHORTTRUE:
               {
                  putbyte( pFunction->pCode[ w ], hObjFile, &bChk );
                  putbyte( pFunction->pCode[ w + 1 ], hObjFile, &bChk );
@@ -598,6 +598,9 @@ static void DataSegment( FILE * hObjFile, BYTE * symbol, ULONG wSymLen, ULONG wS
               }
               break;
 
+              case HB_P_JUMPFAR:
+              case HB_P_JUMPFARFALSE:
+              case HB_P_JUMPFARTRUE:
               case HB_P_PARAMETER:
               case HB_P_SEQBEGIN:
               case HB_P_SEQEND: