diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 52fa94907bb..a9842a08a2c 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
+GCCDIR=	${.CURDIR}/../../../contrib/gcc.295
 
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 7d09ae5ec30..da9badd1b83 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-OBJCDIR=${.CURDIR}/../../../contrib/libobjc
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
+OBJCDIR=${.CURDIR}/../../../contrib/libobjc.295
+GCCDIR=	${.CURDIR}/../../../contrib/gcc.295
 
 .PATH: ${OBJCDIR}/objc ${OBJCDIR}
 
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 0c26b31a1d7..ca357381648 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
+SRCDIR=	${.CURDIR}/../../../contrib/libstdc++.295
 
 .PATH: ${SRCDIR} ${SRCDIR}/stl ${SRCDIR}/../libio
 
diff --git a/gnu/lib/libstdc++/doc/Makefile b/gnu/lib/libstdc++/doc/Makefile
index b0285199e05..e6639b3eab6 100644
--- a/gnu/lib/libstdc++/doc/Makefile
+++ b/gnu/lib/libstdc++/doc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR= ${.CURDIR}/../../../../contrib/libstdc++
+SRCDIR= ${.CURDIR}/../../../../contrib/libstdc++.295
 
 .PATH: ${SRCDIR}/../libio
 
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 806a8a3d91b..79c573e10a3 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -4,7 +4,7 @@
 
 # Sometimes this is .include'd several times...
 .if !defined(GCCDIR)
-GCCDIR=		${.CURDIR}/../../../../contrib/gcc
+GCCDIR=		${.CURDIR}/../../../../contrib/gcc.295
 
 TARGET_ARCH?=	${MACHINE_ARCH}