diff --git a/sys/arch/sandpoint/stand/altboot/Makefile b/sys/arch/sandpoint/stand/altboot/Makefile
index 09358592ee22..ddb673b51da3 100644
--- a/sys/arch/sandpoint/stand/altboot/Makefile
+++ b/sys/arch/sandpoint/stand/altboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2014/08/08 16:56:32 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2014/08/10 17:46:54 joerg Exp $
 
 S=		${.CURDIR}/../../../..
 
@@ -10,7 +10,8 @@ SRCS+=		nif.c fxp.c tlp.c rge.c skg.c stg.c
 SRCS+=		dsk.c pciide.c siisata.c
 SRCS+=		exception.c vers.c
 CLEANFILES+=	vers.c ${PROG} ${PROG}.bin ${PROG}.img
-CFLAGS+=	-Wall -Wno-main -ffreestanding -msoft-float
+CFLAGS+=	-Wall -Wno-main -ffreestanding
+CFLAGS+=	${${ACTIVE_CC} == "gcc":? -msoft-float :}
 CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CPPFLAGS+=	-D_STANDALONE -DSUPPORT_DHCP -DLIBSA_PRINTF_WIDTH_SUPPORT
 #CPPFLAGS+=	-DCONSNAME=\"com\" -DCONSPORT=0x3f8 -DCONSSPEED=115200
diff --git a/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk b/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
index c1aacc191f86..650159b7b447 100644
--- a/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
+++ b/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.powerpc-booke.mk,v 1.2 2014/08/08 16:56:32 joerg Exp $
+#	$NetBSD: bsd.powerpc-booke.mk,v 1.3 2014/08/10 17:46:54 joerg Exp $
 
 .ifndef _BSD_POWERPC_BOOKE_MK_
 _BSD_POWERPC_BOOKE_MK_=1
@@ -7,13 +7,13 @@ KMODULEARCHDIR:=	powerpc-booke
 
 # gcc emits bad code with these options
 #CPPFLAGS+=	-mcpu=8548
-CPPFLAGS+=	-misel -Wa,-me500
+CPPFLAGS+=	${${ACTIVE_CC} == "gcc":? -misel -Wa,-me500 :}
 PPC_BOOKE=	1
 
 # hack into bsd.kmodule.mk
 PPC_INTR_IMPL=\"powerpc/booke/intr.h\"
 PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\"
 
-AFLAGS+=	-Wa,-me500
+AFLAGS+=	${${ACTIVE_CC} == "gcc":? -Wa,-me500 :}
 
 .endif # _BSD_POWERPC_BOOKE_MK_