diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 375335c8f905..b847e2f15915 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	telepathy-gabble
 PORTVERSION=	0.18.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Jabber Connection Manager for Telepathy Framework
 WWW=		https://telepathy.freedesktop.org/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	telepathy-glib>=0.22.0:net-im/telepathy-glib \
 		ca_root_nss>=0:security/ca_root_nss
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libnice.so:net-im/libnice \
 		libtelepathy-glib.so:net-im/telepathy-glib \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus \
 		libgnutls.so:security/gnutls \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libloudmouth-1.so:net-im/loudmouth
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		libnice-gst1>=0:net-im/libnice-gst1
 
 PORTSCOUT=	limitw:1,even
 
 USES=		alias gmake gnome libtool pathfix pkgconfig python:build \
 		shebangfix sqlite ssl
 USE_GNOME=	glib20 gtksourceview3 libxslt:build
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CONFIGURE_ENV=	LIBS="-pthread"
 INSTALL_TARGET=	install-strip
 
 SHEBANG_FILES=	plugins/telepathy-gabble-xmpp-console
 
 PLIST_SUB=	PVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 CONFIGURE_ENV+=	OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include"
 .endif
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' \
 		${WRKSRC}/lib/ext/wocky/configure
 
 .include <bsd.port.post.mk>
diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist
index a6b4c83418d3..4ccdd63927fe 100644
--- a/net-im/telepathy-gabble/pkg-plist
+++ b/net-im/telepathy-gabble/pkg-plist
@@ -1,17 +1,17 @@
 bin/telepathy-gabble-xmpp-console
 lib/telepathy/gabble-0/lib/libgabble-plugins-%%PVERSION%%.so
 lib/telepathy/gabble-0/lib/libgabble-plugins.a
 lib/telepathy/gabble-0/lib/libgabble-plugins.so
 lib/telepathy/gabble-0/lib/libwocky-telepathy-gabble-%%PVERSION%%.so
 lib/telepathy/gabble-0/lib/libwocky.a
 lib/telepathy/gabble-0/lib/libwocky.so
 lib/telepathy/gabble-0/plugins/libconsole.so
 lib/telepathy/gabble-0/plugins/libgateways.so
 libexec/telepathy-gabble
-man/man8/telepathy-gabble.8.gz
+share/man/man8/telepathy-gabble.8.gz
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
 %%DOCSDIR%%/muc-bytestream.html
 %%DOCSDIR%%/olpc.html
 %%DOCSDIR%%/si-multiple.html
 %%DOCSDIR%%/tubes.html
 share/telepathy/managers/gabble.manager