diff --git a/rtl/embedded/avr/atmega128.pp b/rtl/embedded/avr/atmega128.pp
index 926b2bd274..3442cbbdb1 100644
--- a/rtl/embedded/avr/atmega128.pp
+++ b/rtl/embedded/avr/atmega128.pp
@@ -5,7 +5,6 @@ Register definitions and startup code for ATMEL ATmega128
 unit atmega128;
 
 {$goto on}
-{$macro on}
 
   interface
     const
@@ -506,9 +505,6 @@ unit atmega128;
        MUX1 =  1;
        MUX0 =  0;
 
-    {$define DOCALL:=call}
-    {$define DOJMP:=jmp}
-
   implementation
 
 {$i avrcommon.inc}
@@ -555,7 +551,7 @@ unit atmega128;
       asm
         .init
         .globl _start
-//        .org 0x00
+
         jmp _start
         jmp Int00Handler
         jmp Int01Handler
diff --git a/rtl/embedded/avr/atmega8.pp b/rtl/embedded/avr/atmega8.pp
index 5806476bd4..ae82a71890 100644
--- a/rtl/embedded/avr/atmega8.pp
+++ b/rtl/embedded/avr/atmega8.pp
@@ -5,7 +5,6 @@ Register definitions and startup code for ATMEL ATmega128
 unit atmega8;
 
 {$goto on}
-{$macro on}
 
   interface
     const
@@ -253,9 +252,6 @@ unit atmega8;
        MUX1 =  1;
        MUX0 =  0;
 
-    {$define DOCALL:=call}
-    {$define DOJMP:=jmp}
-
   implementation
 
 {$i avrcommon.inc}
@@ -286,7 +282,7 @@ unit atmega8;
       asm
         .init
         .globl _start
-//        .org 0x00
+
         jmp _start
         jmp Int00Handler
         jmp Int01Handler
diff --git a/rtl/embedded/avr/avrcommon.inc b/rtl/embedded/avr/avrcommon.inc
index 8bda8ae573..34b256bab4 100644
--- a/rtl/embedded/avr/avrcommon.inc
+++ b/rtl/embedded/avr/avrcommon.inc
@@ -4,13 +4,13 @@
       asm
         cli
       .Lhalt:
-        jmp .Lhalt
+        rjmp .Lhalt
       end;
 
     procedure Default_IRQ_handler; assembler; nostackframe; public name '_Default_IRQ_handler';noreturn;
       asm
       .Lloop:
-        jmp .Lloop
+        rjmp .Lloop
       end;
 
     var