diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 1f2ac5257f61..86efb3552685 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.963 2016/09/27 16:47:01 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.964 2016/09/29 03:53:13 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1392,12 +1392,13 @@ X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
 
 # During transition from xorg-server 1.10 to 1.18
 .if \
-    ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "i386"   || \
+    ${MACHINE} == "amd64"	|| \
+    ${MACHINE} == "i386"	|| \
     ${MACHINE} == "ofppc"	|| \
     ${MACHINE} == "macppc"	|| \
     ${MACHINE} == "shark"	|| \
     ${MACHINE} == "sparc"	|| \
+    ${MACHINE} == "sparc64"	|| \
     ${MACHINE} == "x68k"
 HAVE_XORG_SERVER_VER?=118
 .else