diff --git a/distrib/utils/libhack/Makefile b/distrib/utils/libhack/Makefile
index c21481a65635..021e9c486855 100644
--- a/distrib/utils/libhack/Makefile
+++ b/distrib/utils/libhack/Makefile
@@ -1,17 +1,24 @@
-# $NetBSD: Makefile,v 1.6 1999/03/13 19:08:43 sommerfe Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/19 03:58:13 gwr Exp $
 #
 # Stubs to kill off some things from libc:
 # This save space on a boot system.
 # (See Makefile.inc also.)
 
 LIB=	hack
-SRCS=	getcap.c getgrent.c gethost.c getnet.c getnetgr.c getpwent.c setlocale.c yplib.c
+SRCS=	getcap.c getgrent.c gethost.c getnet.c getnetgr.c getpwent.c \
+	localeconv.c opendir.c perror.c setlocale.c \
+	strerror.c strsignal.c utmp.c yplib.c
+
 WARNS=	1
 MKPIC=	no
 MKLINT= no
 MKPROFILE=no
 
-all: libhack.a
+all: libhack.a libhack.o
+
+CLEANFILES+=  libhack.o
+libhack.o : $(OBJS)
+	$(LD) -r -o $@ $(OBJS)
 
 tpwent: getpwent.c
 	$(CC) -g -o $@.o -DTEST_MAIN -c getpwent.c
diff --git a/distrib/utils/libhack/Makefile.inc b/distrib/utils/libhack/Makefile.inc
index 2eca6f6b51b0..e19958e33ac6 100644
--- a/distrib/utils/libhack/Makefile.inc
+++ b/distrib/utils/libhack/Makefile.inc
@@ -1,27 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.6 1999/05/06 18:48:23 wrstuden Exp $
+# $NetBSD: Makefile.inc,v 1.7 1999/05/19 03:58:13 gwr Exp $
 # Include this fragment to build libhack.o
 # It is .o and not .a to make sure these are the
 # objects you get (and not the ones in libc.a)
 
 HACKOBJS= getcap.o getgrent.o gethost.o getnet.o getnetgr.o getpwent.o \
-	setlocale.o yplib.o
+	localeconv.o opendir.o perror.o setlocale.o \
+	strerror.o strsignal.o utmp.o yplib.o
 
 libhack.o : $(HACKOBJS)
 	$(LD) -r -o $@ $(HACKOBJS)
 
-getcap.o : ${HACKSRC}/getcap.c
-
-getgrent.o : ${HACKSRC}/getgrent.c
-
-gethost.o : ${HACKSRC}/gethost.c
-
-getnet.o : ${HACKSRC}/getnet.c
-
-getnetgr.o : ${HACKSRC}/getnetgr.c
-
-getpwent.o : ${HACKSRC}/getpwent.c
-
-setlocale.o : ${HACKSRC}/setlocale.c
-
-yplib.o : ${HACKSRC}/yplib.c
+.PATH: ${HACKSRC}