diff --git a/.gitattributes b/.gitattributes
index 59764dbed3..c3a0276491 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1047,7 +1047,7 @@ packages/amunits/src/coreunits/console.pas svneol=native#text/plain
 packages/amunits/src/coreunits/conunit.pas svneol=native#text/plain
 packages/amunits/src/coreunits/datatypes.pas svneol=native#text/plain
 packages/amunits/src/coreunits/diskfont.pas svneol=native#text/plain
-packages/amunits/src/coreunits/exec.pp svneol=native#text/plain
+packages/amunits/src/coreunits/exec.pas svneol=native#text/plain
 packages/amunits/src/coreunits/expansion.pas svneol=native#text/plain
 packages/amunits/src/coreunits/expansionbase.pas svneol=native#text/plain
 packages/amunits/src/coreunits/gadtools.pas svneol=native#text/plain
diff --git a/packages/amunits/Makefile.fpc.fpcmake b/packages/amunits/Makefile.fpc.fpcmake
index c276da741e..ad89fd4dc6 100644
--- a/packages/amunits/Makefile.fpc.fpcmake
+++ b/packages/amunits/Makefile.fpc.fpcmake
@@ -7,18 +7,18 @@ name=amunits
 version=2.7.1
 
 [target]
-units= msgbox amigautils wbargs vartags pastoc tagsarray systemvartags         \
-       deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl     \
+units= msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys \
+       deadkeys consoleio pcq longarray linklist hisoft exec timerutils easyasl \
        doublebuffer intuition graphics amigalib nonvolatile iffparse hardware  \
        expansion diskfont conunit amigados configvars keyboard bootblock icon  \
-       cd realtime rexx translator scsidisk lowlevel configregs prefs parallel \ 
+       cd realtime rexx translator scsidisk lowlevel configregs prefs parallel \
        gadtools prtgfx romboot_base trackdisk expansionbase amigaguide         \
        amigaprinter bullet clipboard keymap utility timer workbench colorwheel \
        prtbase console locale tapedeck serial gameport gradientslider input    \
        audio datatypes asl commodities hardblocks layers inputevent identify   \
        gtlayout tritonmacros render mui picasso96api guigfx preferences        \
        xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib \
-       mysticview ahi lucyplay ahi_sub 
+       mysticview ahi lucyplay ahi_sub
 
 [compiler]
 includedir=src
diff --git a/packages/amunits/fpmake.pp b/packages/amunits/fpmake.pp
index 209a07816c..7a5cc46dba 100644
--- a/packages/amunits/fpmake.pp
+++ b/packages/amunits/fpmake.pp
@@ -49,6 +49,7 @@ begin
     T:=P.Targets.AddUnit('timerutils.pas');
     T:=P.Targets.AddUnit('easyasl.pas');
     T:=P.Targets.AddUnit('doublebuffer.pas');
+    T:=P.Targets.AddUnit('exec.pas');
     T:=P.Targets.AddUnit('intuition.pas');
     T:=P.Targets.AddUnit('graphics.pas');
     T:=P.Targets.AddUnit('amigalib.pas');
diff --git a/packages/amunits/src/coreunits/exec.pp b/packages/amunits/src/coreunits/exec.pas
similarity index 100%
rename from packages/amunits/src/coreunits/exec.pp
rename to packages/amunits/src/coreunits/exec.pas