diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 5052aa79e9ff..c745a4656db1 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	g-wrap
 DISTVERSION=	1.9.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	andrew@tao11.riddles.org.uk
 COMMENT=	Tool for generating function wrappers for Guile
 WWW=		https://www.nongnu.org/g-wrap/
 
 LICENSE=	LGPL21+
 
 LIB_DEPENDS+=	libffi.so:devel/libffi
 
 USES=		gmake gnome guile:2.2 libtool pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--disable-Werror
 
 MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	install-strip
 
 INFO=		g-wrap
 
 # DO NOT try and add rules here to strip .go files, no matter how loudly
 # testport / stage-qa shouts at you about it, because .go files (which are
 # compiled bytecode) are not intended to be stripped and doing so causes
 # breakage at run time.
 
 .include <bsd.port.mk>
diff --git a/devel/g-wrap/pkg-plist b/devel/g-wrap/pkg-plist
index 3de50a57a934..9f2d8bac1c14 100644
--- a/devel/g-wrap/pkg-plist
+++ b/devel/g-wrap/pkg-plist
@@ -1,45 +1,45 @@
 bin/g-wrap-config
 include/g-wrap-wct.h
 include/g-wrap/core-runtime.h
 include/g-wrap/ffi-support.h
 include/g-wrap/guile-compatibility.h
 include/g-wrap/guile-runtime.h
 include/g-wrap/guile-wct.h
 lib/g-wrap/modules/libgw-guile-gw-glib.a
 lib/g-wrap/modules/libgw-guile-gw-glib.so
 lib/g-wrap/modules/libgw-guile-gw-glib.so.0
 lib/g-wrap/modules/libgw-guile-gw-glib.so.0.0.0
 lib/g-wrap/modules/libgw-guile-standard.a
 lib/g-wrap/modules/libgw-guile-standard.so
 lib/g-wrap/modules/libgw-guile-standard.so.0
 lib/g-wrap/modules/libgw-guile-standard.so.0.0.0
 lib/libgwrap-core-runtime.a
 lib/libgwrap-core-runtime.so
 lib/libgwrap-core-runtime.so.2
 lib/libgwrap-core-runtime.so.2.0.0
 lib/libgwrap-guile-runtime.a
 lib/libgwrap-guile-runtime.so
 lib/libgwrap-guile-runtime.so.2
 lib/libgwrap-guile-runtime.so.2.0.0
 libdata/pkgconfig/g-wrap-2.0-guile.pc
-man/man1/g-wrap-config.1.gz
+share/man/man1/g-wrap-config.1.gz
 share/aclocal/g-wrap.m4
 %%GUILE_GLOBAL_SITE%%/g-wrap.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/c-codegen.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/c-types.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/compat.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/config.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/enumeration.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/guile.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/guile/ws/standard.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/gw-glib-spec.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/gw-glib.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/gw-standard-spec.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/gw-wct-spec.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/gw-wct.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/gw/standard.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/rti.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/scm-codegen.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/simple-type.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/util.scm
 %%GUILE_GLOBAL_SITE%%/g-wrap/ws/standard.scm