Index: www/nghttp2/Makefile
===================================================================
--- www/nghttp2/Makefile
+++ www/nghttp2/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	nghttp2
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	www net
-MASTER_SITES=	https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
-		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	HTTP/2.0 C Library
@@ -25,6 +24,9 @@
 OPTIONS_DEFAULT=HPACK
 OPTIONS_SUB=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	tatsuhiro-t
+
 CONFIGURE_ARGS=	--disable-python-bindings \
 		--enable-app \
 		--enable-examples \
@@ -39,7 +41,7 @@
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USES=		compiler:c++11-lib gmake libtool localbase pathfix pkgconfig tar:xz
+USES=		autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig
 
 PORTDATA=	fetch-ocsp-response
 PORTDOCS=	*
@@ -62,7 +64,8 @@
 CONFIGURE_ARGS+=--with-jemalloc
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '/JEMALLOC_LIBS/ s|-ljemalloc||' ${WRKSRC}/configure
+post-stage:
+	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/libnghttp2.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libnghttp2.pc
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
 
 .include <bsd.port.post.mk>
Index: www/nghttp2/distinfo
===================================================================
--- www/nghttp2/distinfo
+++ www/nghttp2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nghttp2-1.6.0.tar.xz) = cc569501d243c934ea980a1f68fadb8ccc4f133ae8a5b15dcd29f0de76f9bac3
-SIZE (nghttp2-1.6.0.tar.xz) = 1399524
+SHA256 (tatsuhiro-t-nghttp2-v1.7.0_GH0.tar.gz) = a4a7588809daa44a4b8fbda04547de6c15b816631addf1a5812d64e61dfdb5bf
+SIZE (tatsuhiro-t-nghttp2-v1.7.0_GH0.tar.gz) = 1561219
Index: www/nghttp2/files/patch-configure.ac
===================================================================
--- /dev/null
+++ www/nghttp2/files/patch-configure.ac
@@ -0,0 +1,14 @@
+--- configure.ac.orig	2016-01-25 10:44:56 UTC
++++ configure.ac
+@@ -255,11 +255,6 @@ if test "x${have_zlib}" = "xno"; then
+   AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
+ fi
+ 
+-# dl: openssl requires libdl when it is statically linked.
+-LIBS_OLD=$LIBS
+-AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], [])
+-LIBS=$LIBS_OLD
+-
+ # cunit
+ PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
+ # If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
Index: www/nghttp2/pkg-plist
===================================================================
--- www/nghttp2/pkg-plist
+++ www/nghttp2/pkg-plist
@@ -12,7 +12,7 @@
 lib/libnghttp2.a
 lib/libnghttp2.so
 lib/libnghttp2.so.14
-lib/libnghttp2.so.14.4.0
+lib/libnghttp2.so.14.4.1
 %%ASIO%%lib/libnghttp2_asio.a
 %%ASIO%%lib/libnghttp2_asio.so
 %%ASIO%%lib/libnghttp2_asio.so.1