diff --git a/math/gap/Makefile b/math/gap/Makefile
index 1432cdbed4f3..3038452f82c4 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -2,47 +2,49 @@
 # $FreeBSD$
 
 PORTNAME=	gap
-PORTVERSION=	4.6.5.${GAP_DISTDATE}
+PORTVERSION=	4.7.2.${GAP_DISTDATE}
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.gap-system.org/pub/gap/gap46/tar.bz2/ \
+MASTER_SITES=	ftp://ftp.gap-system.org/pub/gap/gap47/tar.bz2/ \
 		ftp://ftp.stack.nl/pub/users/johans/gap/ \
-		ftp://ftp.gap-system.org/pub/gap/gap46/old/
+		ftp://ftp.gap-system.org/pub/gap/gap47/old/
 DISTNAME=	${GAP_VERSION}p${PORTVERSION:R:E}_${GAP_DISTTIME}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GAP is a system for computational discrete algebra
 
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+
 USE_BZIP2=	yes
 USES=		gmake
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 ALL_TARGET=	default
 
 MAKE_JOBS_UNSAFE=yes
 
 GAP_VERSION=	${PORTNAME}${PORTVERSION:R:R:S/./r/}	# gap4r5
-GAP_DISTTIME=	2013_07_20-20_02
+GAP_DISTTIME=	2013_12_01-10_17
 GAP_DISTDATE=	${GAP_DISTTIME:C/-.*//:S/_//g}
 GAP_LIBDIR=	${PREFIX}/lib/${GAP_VERSION}
 WRKSRC=		${WRKDIR}/${GAP_VERSION}
 PLIST_FILES=	bin/gap
 
-NO_STAGE=	yes
 do-install:
-	(${SED} -e "s:GAP_DIR=.*:GAP_DIR=${GAP_LIBDIR}:g" -e "s:GAP_PRG=.*:GAP_PRG=gap:g" ${WRKSRC}/bin/gap.sh > ${PREFIX}/bin/gap; \
-	${CHMOD} 755 ${PREFIX}/bin/gap; )
-	@${MKDIR} ${GAP_LIBDIR} ${GAP_LIBDIR}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/*/gap ${GAP_LIBDIR}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/*/gac ${GAP_LIBDIR}/bin
-	@${INSTALL_DATA} ${WRKSRC}/sysinfo.gap ${GAP_LIBDIR}
+	(${SED} -e "s:GAP_DIR=.*:GAP_DIR=${GAP_LIBDIR}:g" -e "s:GAP_PRG=.*:GAP_PRG=gap:g" ${WRKSRC}/bin/gap.sh > ${STAGEDIR}${PREFIX}/bin/gap; \
+	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/gap; )
+	@${MKDIR} ${STAGEDIR}${GAP_LIBDIR}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/*/gap ${STAGEDIR}${GAP_LIBDIR}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/*/gac ${STAGEDIR}${GAP_LIBDIR}/bin
+	@${INSTALL_DATA} ${WRKSRC}/sysinfo.gap ${STAGEDIR}${GAP_LIBDIR}
 .for subdir in doc etc grp lib pkg prim small trans tst
-	@${CP} -R ${WRKSRC}/${subdir} ${GAP_LIBDIR}/
+	@${CP} -R ${WRKSRC}/${subdir} ${STAGEDIR}${GAP_LIBDIR}/
 .endfor
 
 post-install:
-	@${FIND} ${GAP_LIBDIR} -type d -empty -delete
-	@${FIND} ${GAP_LIBDIR} ! -type d | \
-		${SED} 's,${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${GAP_LIBDIR} -type d -depth | \
-		${SED} 's,${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${GAP_LIBDIR} -type d -empty -delete
+	@${FIND} ${STAGEDIR}${GAP_LIBDIR} ! -type d | \
+		${SED} 's,${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${GAP_LIBDIR} -type d -depth | \
+		${SED} 's,${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/math/gap/distinfo b/math/gap/distinfo
index 1daeb3f3c25f..90c8f3b9b23d 100644
--- a/math/gap/distinfo
+++ b/math/gap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gap4r6p5_2013_07_20-20_02.tar.bz2) = 731282de491a900845dafb7eded4e7f0eb69f5ce35300e3fb84088db77269620
-SIZE (gap4r6p5_2013_07_20-20_02.tar.bz2) = 219068318
+SHA256 (gap4r7p2_2013_12_01-10_17.tar.bz2) = ebdf852ff86e2f92e8c9006640d8ebd0125ded029d42d6a42f87e3f0e63435f4
+SIZE (gap4r7p2_2013_12_01-10_17.tar.bz2) = 225062461