--- Mk/Uses/fortran.mk	(revision 537107)
+++ Mk/Uses/fortran.mk	(working copy)
@@ -31,10 +31,10 @@ 
 RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
 F77=		gfortran${_GCC_VER}
 FC=		gfortran${_GCC_VER}
-FFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
-FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
-LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
-		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
+_GCC_RUNTIME:=	${LOCALBASE}/lib/${_GCC_VER}
+FFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}
+FCFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}
+LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME} -B${LOCALBASE}/bin
 .else
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .endif