diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 224620ca954c..74c98a3c36a6 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.4
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		ftp://ftp.gnutls.org/pub/gnutls/ \
diff --git a/security/gnutls-devel/Makefile.man b/security/gnutls-devel/Makefile.man
index c71e85a35aa3..203547f57650 100644
--- a/security/gnutls-devel/Makefile.man
+++ b/security/gnutls-devel/Makefile.man
@@ -285,6 +285,8 @@ MAN3=	\
 	gnutls_strerror.3 \
 	gnutls_transport_get_ptr.3 \
 	gnutls_transport_get_ptr2.3 \
+	gnutls_transport_set_errno.3 \
+	gnutls_transport_set_global_errno.3 \
 	gnutls_transport_set_lowat.3 \
 	gnutls_transport_set_ptr.3 \
 	gnutls_transport_set_ptr2.3 \
diff --git a/security/gnutls-devel/distinfo b/security/gnutls-devel/distinfo
index ca6fab73f429..dec58a58c1b3 100644
--- a/security/gnutls-devel/distinfo
+++ b/security/gnutls-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnutls-1.5.2.tar.bz2) = 3cfdb59d0193e4b6c4e2ba0263af0bac
-SHA256 (gnutls-1.5.2.tar.bz2) = 846720d151aa7f32d471ad363566ecd1bfe9915dbd13be6414333ce3c58a6a19
-SIZE (gnutls-1.5.2.tar.bz2) = 4197414
+MD5 (gnutls-1.5.4.tar.bz2) = b6253b70dd97e236ea3f7ae588b67577
+SHA256 (gnutls-1.5.4.tar.bz2) = d9157aa4e527173bc66748043418b898492f782b174c4d24382b67df860c68bb
+SIZE (gnutls-1.5.4.tar.bz2) = 4225757
diff --git a/security/gnutls-devel/pkg-plist b/security/gnutls-devel/pkg-plist
index 28459923e383..03c61452b32a 100644
--- a/security/gnutls-devel/pkg-plist
+++ b/security/gnutls-devel/pkg-plist
@@ -58,6 +58,5 @@ share/aclocal/libgnutls.m4
 %%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo
-@dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
 @dirrm include/gnutls