diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1b05385b04..09fe5d3582 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,10 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2018-09-02 23:07 UTC+0200 Aleksander Czajczynski (hb fki.pl)
+  * include/hbsetup.h
+    * changed to recognize ARM64 platform with modern GCC builds
+
 2018-06-04 01:30 UTC-0300 Lailton Fernando Mariano (lailton/at/harbour.com.br)
   * contrib/hbexpat/3rd/expat/xmltok.c
     ! fixed compiler error for BCC <= 5.8.2
diff --git a/contrib/hbexpat/3rd/expat/xmltok.c b/contrib/hbexpat/3rd/expat/xmltok.c
old mode 100755
new mode 100644
diff --git a/include/hbsetup.h b/include/hbsetup.h
index f8e4602a2c..9ade03471e 100644
--- a/include/hbsetup.h
+++ b/include/hbsetup.h
@@ -151,7 +151,8 @@
       defined( __MINGW64__ )
    #define HB_CPU_X86_64
 
-#elif defined( __arm64__ )
+#elif defined( __arm64__ ) || \
+      defined( __aarch64__ )
    #define HB_CPU_ARM_64
 
 #elif defined( __arm__ ) || \
diff --git a/src/compiler/hbusage.c b/src/compiler/hbusage.c
old mode 100755
new mode 100644