--- host-dist.defs	2019-05-08 14:39:28.000000000 -0400
+++ host.defs	2019-07-15 17:52:05.000000000 -0400
@@ -851,15 +851,15 @@
 enddef	:
 
 
-newdef	: defined(APPLE) && defined(MACH)
+newdef	: defined(APPLE) && defined(__MACH__)
 comment : OS X
 vendor	:						: "apple"
-hosttype: defined(i386)					: "intel-pc"
+hosttype: defined(i386)					: "intel-mac"
 hosttype: defined(ppc)					: "powermac"
-hosttype: defined(M_amd64)				: "amd"
+hosttype: defined(x86_64)				: "intel-mac"
 ostype	:						: "darwin"
 machtype: defined(i386)					: "i386"
-machtype: defined(M_amd64)				: "x86_64"
+machtype: defined(x86_64)				: "x86_64"
 machtype: defined(ppc)					: "powerpc"
 enddef	: