diff --git a/Makefile.cross b/Makefile.cross
index e696907f3a3..63978279485 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.75 2015/02/08 00:15:22 uebayasi Exp $
+# $OpenBSD: Makefile.cross,v 1.76 2015/05/28 18:23:11 miod Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -86,10 +86,10 @@ COMPILER_VERSION=gcc3
 COMPILER_VERSION=gcc4
 .endif
 
-.if !empty(BINUTILS217_ARCH:M${_arch})
-BINUTILS_VERSION=binutils-2.17
-.else
+.if !empty(BINUTILS215_ARCH:M${_arch})
 BINUTILS_VERSION=binutils
+.else
+BINUTILS_VERSION=binutils-2.17
 .endif
 
 .if !empty(PIE_ARCH:M${_arch})
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index b67f9fbdfea..4dacb1467ea 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.164 2015/05/28 18:16:42 miod Exp $
+#	$OpenBSD: bsd.own.mk,v 1.165 2015/05/28 18:23:13 miod Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -18,7 +18,7 @@ YP?=		yes
 DEBUGLIBS?=	no
 
 GCC3_ARCH=m88k vax
-BINUTILS217_ARCH=alpha amd64 arm hppa hppa64 i386 ia64 mips64 mips64el powerpc sh sparc sparc64
+BINUTILS215_ARCH=m88k vax
 
 # arm needs binutils-2.17, which still lacks W^X support
 # sparc has not been tried
@@ -34,10 +34,10 @@ COMPILER_VERSION?=gcc3
 COMPILER_VERSION?=gcc4
 .endif
 
-.if !empty(BINUTILS217_ARCH:M${_arch})
-BINUTILS_VERSION=binutils-2.17
-.else
+.if !empty(BINUTILS215_ARCH:M${_arch})
 BINUTILS_VERSION=binutils
+.else
+BINUTILS_VERSION=binutils-2.17
 .endif
 
 .if !empty(STATICPIE_ARCH:M${_arch})