diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 33c7638fdcf1..64c497bac842 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.8.2.s20130815
+PORTVERSION=	4.8.2.s20130822
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -37,10 +37,13 @@ USE_PERL5_BUILD=yes
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
+OPTIONS_DEFINE=		BOOTSTRAP
 OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
+OPTIONS_DEFAULT=	BOOTSTRAP
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
+BOOTSTRAP_DESC=		Build using a full bootstrap
 
 .include <bsd.port.pre.mk>
 
@@ -61,6 +64,11 @@ TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
+.if empty(PORT_OPTIONS:MBOOTSTRAP)
+CONFIGURE_ARGS+=--disable-bootstrap
+.else
+ALL_TARGET=	bootstrap-lean
+.endif
 CONFIGURE_ARGS+=--disable-nls \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
@@ -73,7 +81,6 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
-ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 5aad220af8c1..1d7d6b95f8b0 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.8-20130815.tar.bz2) = 98839a700c0ab8a005a18d7704ef5fa553d3ce5771aa357480b11b5cce94389e
-SIZE (gcc-4.8-20130815.tar.bz2) = 81708695
+SHA256 (gcc-4.8-20130822.tar.bz2) = 2499c8adaa5c73dee6ff40f2801661c2b02b462e206e6fb83d3da70757793e61
+SIZE (gcc-4.8-20130822.tar.bz2) = 81718564