Index: Makefile
===================================================================
--- Makefile	(revision 511413)
+++ Makefile	(working copy)
@@ -36,7 +36,6 @@
 
 OPTIONS_DEFINE=	CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
 OPTIONS_DEFAULT=CORBA DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
-OPTIONS_EXCLUDE_powerpc64=	HIPE
 
 CORBA_DESC=	Enable Corba support
 DIRTY_DESC=	Enable Dirty schedulers
@@ -58,6 +57,8 @@
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
+OPTIONS_EXCLUDE_powerpc64=	HIPE ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
+OPTIONS_EXCLUDE_powerpc64_13=	DTRACE
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,