diff -dru sysvinit-2.83/src/Makefile sysvinit-2.83.fjo/src/Makefile
--- sysvinit-2.83/src/Makefile	Tue Jul 31 16:15:48 2001
+++ sysvinit-2.83.fjo/src/Makefile	Sat Dec 28 19:53:53 2002
@@ -8,18 +8,13 @@
 # Version:	@(#)Makefile  2.78  13-Nov-1999  miquels@cistron.nl
 #
 
-CC	= cc
-CFLAGS	= -Wall -O2 -D_GNU_SOURCE
+CC	= diet -Os gcc
+CFLAGS	= -Wall -s -nostdinc -D_BSD_SOURCE -D_GNU_SOURCE
 LDFLAGS	= -s
 STATIC	=
 
-# For Debian we do not build all programs, otherwise we do.
-ifeq ($(DEBIAN),)
-PROGS	= init halt shutdown killall5 runlevel sulogin utmpdump \
+PROGS	= init halt shutdown killall5 runlevel sulogin \
 		last mesg wall
-else
-PROGS	= init halt shutdown killall5 runlevel sulogin last mesg
-endif
 
 BIN_OWNER	= root
 BIN_GROUP	= root
@@ -27,11 +22,6 @@
 INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP)
 MANDIR		= /usr/share/man
 
-# Additional libs for Gnu Libc
-ifneq ($(wildcard /usr/lib/libcrypt.a),)
-LCRYPT		= -lcrypt
-endif
-
 all:		$(PROGS)
 
 init:		init.o init_utmp.o
@@ -85,13 +75,12 @@
 distclean:	clobber
 
 install:
+		$(INSTALL) -d -m 755 \
+			$(ROOT)/bin $(ROOT)/sbin $(ROOT)/usr/bin \
+			$(ROOT)/usr/include $(ROOT)$(MANDIR)/man1 \
+			$(ROOT)$(MANDIR)/man5 $(ROOT)$(MANDIR)/man8 $(ROOT)/dev
 		$(INSTALL) -m 755 halt init killall5 sulogin \
 			runlevel shutdown $(ROOT)/sbin
-		# These are not installed by default
-ifeq ($(DEBIAN),)
-		$(INSTALL) -m 555 utmpdump wall $(ROOT)/usr/bin
-endif
-		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc
 		$(INSTALL) -m 755 mesg last $(ROOT)/usr/bin
 		cd $(ROOT)/sbin; ln -sf halt reboot; chown $(BIN_COMBO) reboot
 		cd $(ROOT)/sbin; ln -sf halt poweroff; chown $(BIN_COMBO) poweroff
@@ -101,15 +90,10 @@
 		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include
 		$(INSTALL) -m 644 ../man/*.8 $(ROOT)$(MANDIR)/man8
 		$(INSTALL) -m 644 ../man/*.5 $(ROOT)$(MANDIR)/man5
-ifeq ($(DEBIAN),)
 		$(INSTALL) -m 644 ../man/wall.1 $(ROOT)$(MANDIR)/man1
-endif
 		$(INSTALL) -m 644 ../man/last.1 ../man/lastb.1 ../man/mesg.1 \
 			$(ROOT)$(MANDIR)/man1
-		#
-		# This part is skipped on debian systems, the
-		# debian.preinst script takes care of it.
-		@if [ ! -p /dev/initctl ]; then \
-		 echo "Creating /dev/initctl"; \
-		 rm -f /dev/initctl; \
-		 mknod -m 600 /dev/initctl p; fi
+		@if [ ! -p $(ROOT)/dev/initctl ]; then \
+		 echo "Creating $(ROOT)/dev/initctl"; \
+		 rm -f $(ROOT)/dev/initctl; \
+		 mknod -m 600 $(ROOT)/dev/initctl p; fi
diff -dru sysvinit-2.83/src/ifdown.c sysvinit-2.83.fjo/src/ifdown.c
--- sysvinit-2.83/src/ifdown.c	Tue Jun  2 22:41:47 1998
+++ sysvinit-2.83.fjo/src/ifdown.c	Sat Dec 28 19:53:53 2002
@@ -14,7 +14,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff -dru sysvinit-2.83/src/last.c sysvinit-2.83.fjo/src/last.c
--- sysvinit-2.83/src/last.c	Wed Jun 13 14:13:21 2001
+++ sysvinit-2.83.fjo/src/last.c	Sat Dec 28 19:53:53 2002
@@ -19,7 +19,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>
diff -dru sysvinit-2.83/src/reboot.h sysvinit-2.83.fjo/src/reboot.h
--- sysvinit-2.83/src/reboot.h	Wed Sep 24 10:55:52 1997
+++ sysvinit-2.83.fjo/src/reboot.h	Sat Dec 28 19:55:29 2002
@@ -6,9 +6,7 @@
  *
  */
 
-#if defined(__GLIBC__)
-#  include <sys/reboot.h>
-#endif
+#include <sys/reboot.h>
 
 #define BMAGIC_HARD	0x89ABCDEF
 #define BMAGIC_SOFT	0
@@ -16,8 +14,4 @@
 #define BMAGIC_HALT	0xCDEF0123
 #define BMAGIC_POWEROFF	0x4321FEDC
 
-#if defined(__GLIBC__)
-  #define init_reboot(magic) reboot(magic)
-#else
-  #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
-#endif
+#define init_reboot(magic) reboot(magic)