--- src/Makefile
+++ src/Makefile	2010-03-23 15:11:12.000000000 +0000
@@ -9,16 +9,16 @@
 #
 
 CPPFLAGS = -DUSE_PAM
-CFLAGS	?= -ansi -O2 -fomit-frame-pointer
+CFLAGS	?= $(RPM_OPT_FLAGS)
 override CFLAGS += -W -Wall -D_GNU_SOURCE
 STATIC	=
 
 # For some known distributions we do not build all programs, otherwise we do.
 BIN	=
 SBIN	= init halt shutdown runlevel killall5 fstab-decode
-USRBIN	= last mesg
+USRBIN	= last
 
-MAN1	= last.1 lastb.1 mesg.1
+MAN1	= last.1 lastb.1
 MAN5	= initscript.5 inittab.5
 MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
 MAN8	+= shutdown.8 telinit.8 fstab-decode.8
@@ -170,7 +170,8 @@ endif
 		ln -sf halt $(ROOT)/sbin/reboot
 		ln -sf halt $(ROOT)/sbin/poweroff
 		ln -sf init $(ROOT)/sbin/telinit
-		ln -sf /sbin/killall5 $(ROOT)/bin/pidof
+		ln -sf killall5 $(ROOT)/sbin/pidof
+		ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
 			ln -sf last $(ROOT)/usr/bin/lastb; \
 		fi
--- src/bootlogd.c
+++ src/bootlogd.c	2011-03-15 14:58:54.000000000 +0000
@@ -241,7 +241,7 @@
 int consolename(char *res, size_t rlen)
 {
 #ifdef TIOCGDEV
-	unsigned int	kdev;
+	kdev_t		kdev;
 #endif
 	struct stat	st;
 	int		n;
@@ -559,7 +559,7 @@
 	}
 
 	(void)ioctl(0, TIOCCONS, NULL);
-#if 1
+#if 0
 	/* Work around bug in 2.1/2.2 kernels. Fixed in 2.2.13 and 2.3.18 */
 	if ((n = open("/dev/tty0", O_RDWR)) >= 0) {
 		(void)ioctl(n, TIOCCONS, NULL);