diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 1dfd1d544204..70dcf408770f 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -18,16 +18,20 @@
 
 MACHINE_ARCH=	sparc64
 
-AR=		/arch/sparc64/usr/bin/sparc64-ar
-CC=		/arch/sparc64/usr/bin/sparc64-unknown-elf-gcc -D__sparc64__ -D__FreeBSD__=5
-LD=		/arch/sparc64/usr/bin/sparc64-ld
-NM=		/arch/sparc64/usr/bin/sparc64-nm
-OBJCOPY=	/arch/sparc64/usr/bin/sparc64-objcopy
-OBJDUMP=	/arch/sparc64/usr/bin/sparc64-objdump
-RANLIB=		/arch/sparc64/usr/bin/sparc64-ranlib
-SIZE=		/arch/sparc64/usr/bin/sparc64-size
+TOOLPATH=	/arch/sparc64/native-uberbaum/bin
+TOOLPREFIX=
+AR=		${TOOLPATH}/${TOOLPREFIX}ar
+CC=		${TOOLPATH}/${TOOLPREFIX}gcc
+LD=		${TOOLPATH}/${TOOLPREFIX}ld
+NM=		${TOOLPATH}/${TOOLPREFIX}nm
+OBJCOPY=	${TOOLPATH}/${TOOLPREFIX}objcopy
+OBJDUMP=	${TOOLPATH}/${TOOLPREFIX}objdump
+RANLIB=		${TOOLPATH}/${TOOLPREFIX}ranlib
+SIZE=		${TOOLPATH}/${TOOLPREFIX}size
 
-COPT+=	-B/arch/sparc64/usr/sparc64-deo-freebsd5/bin/
+COPT+=	-B${TOOLPATH}/
+
+NO_CPU_COPTFLAGS=true
 
 CWARNFLAGS=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
@@ -52,7 +56,7 @@ S=	../../..
 .include "$S/conf/kern.pre.mk"
 
 # XXX: this should probably go somewhere else
-COPTS+=		-mcmodel=medlow
+COPTS+=		-mcmodel=medlow -msoft-float
 
 SYSTEM_SFILES= $S/$M/$M/locore.s $S/$M/$M/exception.s
 SYSTEM_OBJS= locore.o exception.o vnode_if.o ${OBJS} hints.o env.o config.o hack.So