--- Imake.cf.orig	2016-10-08 13:10:32 UTC
+++ Imake.cf
@@ -257,6 +257,41 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
 #define KNetBSDArchitecture
 #endif
 
+#ifdef __BSDSUniX__
+# define MacroIncludeFile <BSDSUniX.cf>
+# define MacroFile BSDSUniX.cf
+# undef __BSDSUniX__
+# define BSDSUniXArchitecture
+# define FreeBSDArchitecture
+# ifdef __i386__
+#  define i386BsdArchitecture
+#  define i386Architecture
+#  undef i386
+# endif
+# ifdef __alpha__
+#  define AlphaBsdArchitecture
+#  define AlphaArchitecture
+#  undef __alpha__
+# endif
+# ifdef __sparc64__
+#  define Sparc64Architecture
+#  undef __sparc64__
+# endif
+# ifdef __ia64__
+#  define ia64Architecture
+#  undef __ia64__
+# endif
+# ifdef __amd64__
+#  define AMD64Architecture
+#  undef __amd64__
+#  undef __x86_64__
+# endif
+# ifdef __powerpc__
+#  define PpcArchitecture
+#  undef __powerpc__
+# endif
+#endif /* __BSDSUniX__ */
+
 #ifdef __DragonFly__
 # define MacroIncludeFile <DragonFly.cf>
 # define MacroFile DragonFly.cf