diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index 449a93396f1..9443fe5019a 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,9 +1,16 @@
+# $Id: Makefile,v 1.7 1997/02/22 15:45:24 peter Exp $
+
+.PATH:  ${.CURDIR}/../../../contrib/diff
+
 PROG=		sdiff
 SRCS=		sdiff.c getopt.c getopt1.c version.c
-CFLAGS+=	-I$(.CURDIR)/../diff -DHAVE_CONFIG_H \
-		-DDIFF_PROGRAM=\"/usr/bin/diff\"
-.PATH: $(.CURDIR)/../diff
-MAN=		sdiff.1
+
+# Important for ctype macros!
+CFLAGS+=-funsigned-char
+
+CFLAGS+=-I${.CURDIR}/../../../contrib/diff
+CFLAGS+=-DHAVE_CONFIG_H
+CFLAGS+=-DDIFF_PROGRAM=\"/usr/bin/diff\"
+CFLAGS+=-DDEFAULT_EDITOR_PROGRAM=\"/usr/bin/vi\"
 
 .include <bsd.prog.mk>
-.PATH: $(.CURDIR)/../diff