diff --git a/security/gnutls3/Makefile b/security/gnutls3/Makefile
index cc6350e0454e..35be1f26221d 100644
--- a/security/gnutls3/Makefile
+++ b/security/gnutls3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnutls
-PORTVERSION=	3.1.17
+PORTVERSION=	3.1.18
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/
 PKGNAMESUFFIX=	${GNUTLS_SUFFIX}
@@ -24,7 +24,7 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack
 USE_LDCONFIG=	${PREFIX}/lib/gnutls3
 USE_XZ=		yes
-CPPFLAGS=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 LDFLAGS=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=		MAKEINFO=${PREFIX}/bin/makeinfo
diff --git a/security/gnutls3/distinfo b/security/gnutls3/distinfo
index ff1668db6903..8521a4325311 100644
--- a/security/gnutls3/distinfo
+++ b/security/gnutls3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnutls-3.1.17.tar.xz) = 5991a827025efb4978fb8f37a8b04f44c036f1f0825ea9b45be884267b9a92c1
-SIZE (gnutls-3.1.17.tar.xz) = 5183008
+SHA256 (gnutls-3.1.18.tar.xz) = 62c0a9963bb3e5466bb614e78839f2ae0ed8d2c9f1e3b6d2727214f810fa5dc4
+SIZE (gnutls-3.1.18.tar.xz) = 5027408
diff --git a/security/gnutls3/pkg-plist b/security/gnutls3/pkg-plist
index d1121a7e784b..535bfea4190a 100644
--- a/security/gnutls3/pkg-plist
+++ b/security/gnutls3/pkg-plist
@@ -35,9 +35,6 @@ info/gnutls3/gnutls-modauth.png
 info/gnutls3/gnutls-pgp.png
 info/gnutls3/gnutls-x509.png
 info/gnutls3/gnutls.info
-info/gnutls3/gnutls.info-1
-info/gnutls3/gnutls.info-2
-info/gnutls3/gnutls.info-3
 info/gnutls3/gnutls.info-4
 info/gnutls3/gnutls.info-5
 info/gnutls3/pkcs11-vision.png