diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index b9587ddc7..b28af3ce9 100644
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -86,6 +86,10 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #     define ZaurusArchitecture
 #   endif
 # endif
+# if defined(__aarch64__)
+#  define AArch64Architecture
+#  undef __aarch64__
+# endif
 # if defined(__mc68020__) || defined(mc68020)
 #  define Mc68020Architecture
 #  if defined(amiga)
@@ -180,6 +184,10 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #  define AMD64Architecture
 #  undef amd64
 # endif
+# ifdef __aarch64__
+#  define AArch64Architecture
+#  undef __aarch64__
+# endif
 #endif /* __FreeBSD__ */
 
 #ifdef sun
@@ -479,14 +487,14 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #   undef __arm__
 #   undef __arm32__
 # endif
-# if defined(__sparc__) || defined(sparc)
-# define SparcArchitecture
-# undef sparc
-# endif
 # if defined(__aarch64__)
 #   define AArch64Architecture
 #   undef __aarch64__
 # endif
+# if defined(__sparc__) || defined(sparc)
+# define SparcArchitecture
+# undef sparc
+# endif
 #endif /* linux */
 
 #if defined(sequent) || defined(_SEQUENT_)