diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 49ae67cdf88a..5d3625f4a583 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.135 2004/06/04 04:45:50 thorpej Exp $
+#	$NetBSD: Makefile.i386,v 1.136 2004/07/15 03:35:20 atatat Exp $
 
 # Makefile for NetBSD
 #
@@ -106,16 +106,14 @@ clock.o: config_time.h
 .if !empty(OBJS:M\/athhal-elf.o)
 OBJS:=${OBJS:C/\/athhal-elf.o/athhal-elf.o/}
  
-UUDECODE_FILES=athhal-elf-o
-UUDECODE_FILES_RENAME_athhal-elf-o=athhal-elf.o
-
-athhal-elf.o: athhal-elf-o
-
-EXTRA_CLEAN+= athhal-elf-o
-
 .PATH: $S/../contrib/sys/arch/i386/dev
-
-.include <bsd.files.mk>
+ATH_UUDEC?=	@${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
+		${_MKSHECHO}\
+		${UUDECODE} -p $> \> ${.TARGET}; \
+		rm -f ${.TARGET}; \
+		${UUDECODE} -p $> > ${.TARGET}
+athhal-elf.o: athhal-elf-o.uue
+	${ATH_UUDEC}
 .endif
 
 ##
diff --git a/sys/conf/Makefile.kern.inc b/sys/conf/Makefile.kern.inc
index 0d63912d2912..e47d79c1262c 100644
--- a/sys/conf/Makefile.kern.inc
+++ b/sys/conf/Makefile.kern.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.54 2004/07/13 09:07:54 uebayasi Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.55 2004/07/15 03:35:20 atatat Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -29,6 +29,7 @@ OBJCOPY?=	objcopy
 OBJDUMP?=	objdump
 CSCOPE?=	cscope
 MKID?=		mkid
+UUDECODE?=	${TOOL_UUDECODE:Uuudecode}
 .MAKEOVERRIDES+=USETOOLS	# make sure proper value is propagated
 
 _MKMSG?=		@\#