diff --git a/gnu/usr.bin/awk/Makefile b/gnu/usr.bin/awk/Makefile
index 1fa87cc9c8ce..1af817fdfd26 100644
--- a/gnu/usr.bin/awk/Makefile
+++ b/gnu/usr.bin/awk/Makefile
@@ -1,13 +1,29 @@
+# Makefile copyright James Raynard (jraynard@freebsd.org) 1997
+#
+# $Id$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${.CURDIR}/../../../contrib/awk
+
 PROG=	awk
-SRCS=	main.c eval.c builtin.c msg.c iop.c io.c field.c getopt1.c \
-	getopt.c array.c \
-	node.c version.c re.c awk.c dfa.c
-CFLAGS+=-I${.CURDIR} -DGAWK
-CLEANFILES+=awk.c y.tab.h
+SRCS=	array.c awktab.c builtin.c eval.c field.c gawkmisc.c io.c main.c \
+	missing.c msg.c node.c re.c version.c dfa.c getopt.c getopt1.c random.c
+MAN1=	doc/awk.1
+
+YACC = bison -y
+
+CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../../contrib/awk
+CFLAGS+=	-DHAVE_CONFIG_H -DGAWK -DDEFPATH=\".\"
+CLEANFILES	+=awktab.c y.output y.tab.h
 
 SUBDIR+= doc
 
 DPADD+= ${LIBGNUREGEX} ${LIBM}
 LDADD+= -lgnuregex -lm
 
+
+awktab.c:	${.CURDIR}/../../../contrib/awk/awk.y
+	$(YACC) -v $> && mv y.tab.c awktab.c
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/awk/doc/Makefile b/gnu/usr.bin/awk/doc/Makefile
index b49ef8b47dcd..456e6e004c9a 100644
--- a/gnu/usr.bin/awk/doc/Makefile
+++ b/gnu/usr.bin/awk/doc/Makefile
@@ -1,6 +1,11 @@
+# Makefile copyright James Raynard (jraynard@freebsd.org) 1997
+#
+# $Id: Makefile,v 1.5 1997/10/11 17:05:07 jraynard Exp $
+
+.PATH:	${.CURDIR}/../../../../contrib/awk/doc
+
 INFO = gawk
 INFOSECTION= "System Utilities"
 INFOENTRY_gawk= "* GAWK: (gawk).			The GNU AWK language interpreter manual."
 
-
 .include <bsd.info.mk>