diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 50e797f4cc43..5b2f4b4cf4e5 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -7,13 +7,11 @@ MAN=	rcorder.8
 
 LIBADD=	util
 
-# XXX hack for make's hash.[ch]
-CFLAGS+= -DORDER -I.
+CFLAGS+= -DORDER
 
-SRCS+=	util.h
-CLEANFILES+=	util.h
-
-util.h:
-	ln -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET}
+#CFLAGS+= -DDEBUG
+.if ${CFLAGS:M*-DDEBUG}
+CFLAGS+= -I${.CURDIR}/../../usr.bin/make
+.endif
 
 .include <bsd.prog.mk>
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 83f6df839682..8c46b4fd1def 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <stdio.h>
+#include <libutil.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
 
 #include "ealloc.h"
 #include "sprite.h"