diff --git a/devel/arm-elf-gcc295/Makefile b/devel/arm-elf-gcc295/Makefile
index 583e4c87b170..c62959c27e0d 100644
--- a/devel/arm-elf-gcc295/Makefile
+++ b/devel/arm-elf-gcc295/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	gcc-arm
+# New ports collection makefile for:	arm-elf-gcc295
 # Date created:		3 November 2000
 # Whom:			Espen Skoglund <esk@ira.uka.de>
 #
@@ -8,9 +8,12 @@
 PORTNAME=	gcc
 PORTVERSION=	2.95.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gcc
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/releases/${DISTNAME}
 PKGNAMEPREFIX=	arm-elf-
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	esk@ira.uka.de
 
@@ -25,12 +28,10 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --enable-languages="c,c++,objc"
 CONFIGURE_ARGS+=	--with-cpu="${DEFAULT_CPU}"
 .endif
 
-MAKE_ENV=		PATH=${PREFIX}/bin:${PATH}
+MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure etc/configure gcc/ch/configure gcc/configure \
-		libchill/configure libf2c/configure libf2c/libF77/configure \
-		libf2c/libI77/configure libf2c/libU77/configure \
-		libiberty/configure libobjc/configure texinfo/configure \
+LIBTOOLFILES=	configure etc/configure gcc/configure libiberty/configure \
+		libobjc/configure texinfo/configure \
 		texinfo/testsuite/configure
 MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 cccp.1
 
diff --git a/devel/arm-elf-gcc295/distinfo b/devel/arm-elf-gcc295/distinfo
index d9a40a49ef5c..88bd29a19e2b 100644
--- a/devel/arm-elf-gcc295/distinfo
+++ b/devel/arm-elf-gcc295/distinfo
@@ -1 +1,3 @@
-MD5 (gcc-2.95.2.tar.bz2) = 7caa851b4a360b6ff027897f455348d5
+MD5 (gcc-core-2.95.2.tar.bz2) = ec486554bc3491f1ebbb3b850c12650a
+MD5 (gcc-g++-2.95.2.tar.bz2) = eaabfb6b09d5f0ada4d7ce45db8b7e52
+MD5 (gcc-objc-2.95.2.tar.bz2) = 44e0ba43e4c9b68e2ecaa7a50c1cddab
diff --git a/devel/arm-elf-gcc295/pkg-plist b/devel/arm-elf-gcc295/pkg-plist
index bc021754373f..d40a63e68b83 100644
--- a/devel/arm-elf-gcc295/pkg-plist
+++ b/devel/arm-elf-gcc295/pkg-plist
@@ -53,7 +53,6 @@ lib/gcc-lib/arm-elf/2.95.2/include/va-v850.h
 lib/gcc-lib/arm-elf/2.95.2/include/varargs.h
 lib/gcc-lib/arm-elf/2.95.2/libgcc.a
 lib/gcc-lib/arm-elf/2.95.2/specs
-@dirrm arm-elf/include
 @dirrm lib/gcc-lib/arm-elf/2.95.2/include
 @dirrm lib/gcc-lib/arm-elf/2.95.2
 @dirrm lib/gcc-lib/arm-elf
diff --git a/devel/arm-elf-gcc31/Makefile b/devel/arm-elf-gcc31/Makefile
index 583e4c87b170..c62959c27e0d 100644
--- a/devel/arm-elf-gcc31/Makefile
+++ b/devel/arm-elf-gcc31/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	gcc-arm
+# New ports collection makefile for:	arm-elf-gcc295
 # Date created:		3 November 2000
 # Whom:			Espen Skoglund <esk@ira.uka.de>
 #
@@ -8,9 +8,12 @@
 PORTNAME=	gcc
 PORTVERSION=	2.95.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gcc
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/releases/${DISTNAME}
 PKGNAMEPREFIX=	arm-elf-
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	esk@ira.uka.de
 
@@ -25,12 +28,10 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --enable-languages="c,c++,objc"
 CONFIGURE_ARGS+=	--with-cpu="${DEFAULT_CPU}"
 .endif
 
-MAKE_ENV=		PATH=${PREFIX}/bin:${PATH}
+MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure etc/configure gcc/ch/configure gcc/configure \
-		libchill/configure libf2c/configure libf2c/libF77/configure \
-		libf2c/libI77/configure libf2c/libU77/configure \
-		libiberty/configure libobjc/configure texinfo/configure \
+LIBTOOLFILES=	configure etc/configure gcc/configure libiberty/configure \
+		libobjc/configure texinfo/configure \
 		texinfo/testsuite/configure
 MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 cccp.1
 
diff --git a/devel/arm-elf-gcc31/distinfo b/devel/arm-elf-gcc31/distinfo
index d9a40a49ef5c..88bd29a19e2b 100644
--- a/devel/arm-elf-gcc31/distinfo
+++ b/devel/arm-elf-gcc31/distinfo
@@ -1 +1,3 @@
-MD5 (gcc-2.95.2.tar.bz2) = 7caa851b4a360b6ff027897f455348d5
+MD5 (gcc-core-2.95.2.tar.bz2) = ec486554bc3491f1ebbb3b850c12650a
+MD5 (gcc-g++-2.95.2.tar.bz2) = eaabfb6b09d5f0ada4d7ce45db8b7e52
+MD5 (gcc-objc-2.95.2.tar.bz2) = 44e0ba43e4c9b68e2ecaa7a50c1cddab
diff --git a/devel/arm-elf-gcc31/pkg-plist b/devel/arm-elf-gcc31/pkg-plist
index bc021754373f..d40a63e68b83 100644
--- a/devel/arm-elf-gcc31/pkg-plist
+++ b/devel/arm-elf-gcc31/pkg-plist
@@ -53,7 +53,6 @@ lib/gcc-lib/arm-elf/2.95.2/include/va-v850.h
 lib/gcc-lib/arm-elf/2.95.2/include/varargs.h
 lib/gcc-lib/arm-elf/2.95.2/libgcc.a
 lib/gcc-lib/arm-elf/2.95.2/specs
-@dirrm arm-elf/include
 @dirrm lib/gcc-lib/arm-elf/2.95.2/include
 @dirrm lib/gcc-lib/arm-elf/2.95.2
 @dirrm lib/gcc-lib/arm-elf