diff --git a/gnu/Makefile b/gnu/Makefile
index 3dcddd50032c..c8a59b42e67b 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -1,5 +1,6 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
 
-SUBDIR=	bc diff diff3 egrep fgrep gawk gcc2 grep groff gzip patch pr rcs sort tar cvs 
+SUBDIR=	bc cvs diff diff3 egrep fgrep gas gawk gcc2 gdb grep groff gzip \
+	ld patch pr rcs sort tar
 
 .include <bsd.subdir.mk>
diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc
index 0bf16db9b01a..8eb90e8f168d 100644
--- a/gnu/Makefile.inc
+++ b/gnu/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	5.1 (Berkeley) 5/11/90
 
-BINDIR?=	/usr/gnu/bin
-LIBDIR?=	/usr/gnu/lib
+BINDIR?=	/usr/bin
+LIBDIR?=	/usr/lib