diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index bfaba522a0..5288c0e57b 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -261,10 +261,7 @@ endif
 # Setup Targets
 #####################################################################
 
-ifeq ($(OS_TARGET),win32)
-USE_CMP_FOR_DIFF=1
-endif
-ifeq ($(OS_TARGET),win64)
+ifneq ($(findstring $(OS_TARGET),win32 win64 aix),)
 USE_CMP_FOR_DIFF=1
 endif
 
diff --git a/packages/fcl-web/src/base/Makefile.fpc b/packages/fcl-web/src/base/Makefile.fpc
index df37405bf5..759668f9be 100644
--- a/packages/fcl-web/src/base/Makefile.fpc
+++ b/packages/fcl-web/src/base/Makefile.fpc
@@ -23,6 +23,7 @@ units_openbsd=custfcgi fpfcgi
 units_linux=custfcgi fpfcgi
 units_win32=custfcgi fpfcgi
 units_win64=custfcgi fpfcgi
+units_aix=custfcgi fpfcgi
 
 [require]
 packages=fcl-base fcl-xml fcl-db fcl-process httpd22 fastcgi fcl-net
diff --git a/packages/fppkg/fpmake.pp b/packages/fppkg/fpmake.pp
index a6780fcf0c..0d3e6aa609 100644
--- a/packages/fppkg/fpmake.pp
+++ b/packages/fppkg/fpmake.pp
@@ -8,7 +8,7 @@ uses fpmkunit, sysutils;
 procedure add_fppkg;
 
 const
-  TargetsWithWGet = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince];
+  TargetsWithWGet = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince,aix];
   TargetsWithfpWeb = TargetsWithWGet;
 
 Var
diff --git a/rtl/Makefile.fpc b/rtl/Makefile.fpc
index 3a3e647cb5..6a52b5befd 100644
--- a/rtl/Makefile.fpc
+++ b/rtl/Makefile.fpc
@@ -35,6 +35,7 @@ dirs_symbian=symbian
 dirs_embedded=embedded
 dirs_nativent=nativent
 dirs_wii=wii
+dirs_aix=aix
 
 [install]
 fpcpackage=y