diff --git a/lang/gcc/3.3/Makefile b/lang/gcc/3.3/Makefile
index 4bc144664cc..677d48e4166 100644
--- a/lang/gcc/3.3/Makefile
+++ b/lang/gcc/3.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2007/04/01 16:44:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.24 2007/05/16 10:19:14 steven Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax
 
@@ -6,13 +6,13 @@ V=3.3.6
 FULL_VERSION=3.3.6
 FULL_PKGVERSION=3.3.6
 
-PKGNAME-main=	gcc-${FULL_PKGVERSION}p4
-PKGNAME-c++ =	g++-${FULL_PKGVERSION}p3
-PKGNAME-estdc=	libstdc++-${FULL_PKGVERSION}p0
-PKGNAME-g77=	g77-${FULL_PKGVERSION}p3
-PKGNAME-java=	gcj-${FULL_PKGVERSION}p0
-PKGNAME-objc=	gobjc-${FULL_PKGVERSION}p4
-PKGNAME-ada=	gnat-${FULL_PKGVERSION}p2
+PKGNAME-main=	gcc-${FULL_PKGVERSION}p5
+PKGNAME-c++ =	g++-${FULL_PKGVERSION}p4
+PKGNAME-estdc=	libstdc++-${FULL_PKGVERSION}p1
+PKGNAME-g77=	g77-${FULL_PKGVERSION}p4
+PKGNAME-java=	gcj-${FULL_PKGVERSION}p1
+PKGNAME-objc=	gobjc-${FULL_PKGVERSION}p5
+PKGNAME-ada=	gnat-${FULL_PKGVERSION}p3
 SHARED_LIBS=	estdc++		6.0 \
 		g2c		1.0 \
 		-org-w3c-dom	1.0 \
diff --git a/lang/gcc/4.2/Makefile b/lang/gcc/4.2/Makefile
index 16b32e0cae1..6f2ba40b4e0 100644
--- a/lang/gcc/4.2/Makefile
+++ b/lang/gcc/4.2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2007/04/01 16:44:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.13 2007/05/16 10:19:14 steven Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN='adjust for types changes'
@@ -8,14 +8,14 @@ DATE=20070307
 FULL_VERSION=4.2-${DATE}
 FULL_PKGVERSION=4.2.${DATE}
 
-PKGNAME-main=  gcc-${FULL_PKGVERSION}
-PKGNAME-c++ =  g++-${FULL_PKGVERSION}
-PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}
-PKGNAME-g77=   g77-${FULL_PKGVERSION}
-PKGNAME-f95=   g95-${FULL_PKGVERSION}
-PKGNAME-java=  gcj-${FULL_PKGVERSION}
-PKGNAME-objc=  gobjc-${FULL_PKGVERSION}
-PKGNAME-ada=   gnat-${FULL_PKGVERSION}
+PKGNAME-main=  gcc-${FULL_PKGVERSION}p0
+PKGNAME-c++ =  g++-${FULL_PKGVERSION}p0
+PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}p0
+PKGNAME-g77=   g77-${FULL_PKGVERSION}p0
+PKGNAME-f95=   g95-${FULL_PKGVERSION}p0
+PKGNAME-java=  gcj-${FULL_PKGVERSION}p0
+PKGNAME-objc=  gobjc-${FULL_PKGVERSION}p0
+PKGNAME-ada=   gnat-${FULL_PKGVERSION}p0
 SHARED_LIBS=	estdc++		7.0 \
 		gfortran	2.0 \
 		-org-w3c-dom	1.0 \
diff --git a/lang/gcc/Makefile.inc b/lang/gcc/Makefile.inc
index e99a15f54f2..19f7031a299 100644
--- a/lang/gcc/Makefile.inc
+++ b/lang/gcc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2006/11/22 17:40:43 bernd Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2007/05/16 10:19:14 steven Exp $
 
 # common stuff for all gcc ports
 # we assume each one defines a V variable.
@@ -30,6 +30,8 @@ PKGNAME-java?=	gcj-${FULL_PKGVERSION}
 PKGNAME-objc?=	gobjc-${FULL_PKGVERSION}
 PKGNAME-ada?=	gnat-${FULL_PKGVERSION}
 
+HOMEPAGE?=	http://gcc.gnu.org/
+
 DIST_SUBDIR=gcc
 CONFIG=${MACHINE_ARCH}-unknown-openbsd${OSREV}
 SUBST_VARS+=CONFIG V