diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index efb89ac90914..02d2a44ae1f4 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -6,42 +6,45 @@
 #
 
 PORTNAME=	ntl
-PORTVERSION=	5.4.2
-PORTREVISION=	2
+PORTVERSION=	5.5.2
 CATEGORIES=	math
 MASTER_SITES=	http://www.shoup.net/ntl/
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Victor Shoup's Number Theory Library
 
 # ntl is faster with libgmp4, but you can disable it
 .if !defined(WITHOUT_GMP)
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
+
+CONFIGURE_ARGS=	NTL_GMP_LIP=on
 .endif
 
 USE_PERL5_BUILD=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" NTL_STD_CXX=on
+CONFIGURE_ARGS+=	AR="${AR}" \
+		CC="${CC}" CFLAGS="${CFLAGS}" \
+		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		DEF_PREFIX="${LOCALBASE}" \
+		LDFLAGS="${LDFLAGS}" NTL_STD_CXX=on \
+		PREFIX="${PREFIX}" RANLIB="${RANLIB}"
 
-.if !defined(WITHOUT_GMP)
-CONFIGURE_ARGS+=	NTL_GMP_LIP=on GMP_PREFIX="${LOCALBASE}"
-.endif
-
-CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
-
-BUILD_WRKSRC=	${WRKSRC}/src
+WRKSRC=	${WRKDIR}/${DISTNAME}/src
 MAKEFILE=	makefile
 
 do-install:
 	${MKDIR} ${PREFIX}/include/NTL
-	${INSTALL_DATA} ${WRKSRC}/include/NTL/*  ${PREFIX}/include/NTL/
-	${INSTALL_DATA} ${BUILD_WRKSRC}/ntl.a ${PREFIX}/lib/libntl.a
+	${INSTALL_DATA} ${WRKSRC}/../include/NTL/*  ${PREFIX}/include/NTL/
+	${INSTALL_DATA} ${WRKSRC}/ntl.a ${PREFIX}/lib/libntl.a
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
 .endif
 
+test: build
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+
 .include <bsd.port.mk>
diff --git a/math/ntl/distinfo b/math/ntl/distinfo
index 51a0e78154d5..b5d5ad59490d 100644
--- a/math/ntl/distinfo
+++ b/math/ntl/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntl-5.4.2.tar.gz) = 0aac5c680eee09a19732e1601b237a0b
-SHA256 (ntl-5.4.2.tar.gz) = 06925936cabba68e4c3d7371e8681381292d21e8cc22ac68314bf36e265ded58
-SIZE (ntl-5.4.2.tar.gz) = 692630
+MD5 (ntl-5.5.2.tar.gz) = 2e0afa1fa3b325e562ce89da57cba983
+SHA256 (ntl-5.5.2.tar.gz) = ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56
+SIZE (ntl-5.5.2.tar.gz) = 707247
diff --git a/math/ntl/pkg-plist b/math/ntl/pkg-plist
index 2507b2a6c9d4..058c7deaf8c2 100644
--- a/math/ntl/pkg-plist
+++ b/math/ntl/pkg-plist
@@ -148,6 +148,7 @@ lib/libntl.a
 %%PORTDOCS%%%%DOCSDIR%%/tour-ex5.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-ex6.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-examples.html
+%%PORTDOCS%%%%DOCSDIR%%/tour-gf2x.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-gmp.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-impl.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-intro.html
@@ -156,6 +157,7 @@ lib/libntl.a
 %%PORTDOCS%%%%DOCSDIR%%/tour-stdcxx.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-struct.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-time.html
+%%PORTDOCS%%%%DOCSDIR%%/tour-tips.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-unix.html
 %%PORTDOCS%%%%DOCSDIR%%/tour-win.html
 %%PORTDOCS%%%%DOCSDIR%%/tour.html