diff --git a/graphics/xviewer/Makefile b/graphics/xviewer/Makefile
index 8e172fb4fad2..a892d4354992 100644
--- a/graphics/xviewer/Makefile
+++ b/graphics/xviewer/Makefile
@@ -1,53 +1,51 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	xviewer
 PORTVERSION=	3.2.4
 CATEGORIES=	graphics gnome
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fast and functional image viewer
 
 LICENSE=	GPLv2+
 
 PORTSCOUT=	limit:^[0-9.]+$$	# ignore non-numeric tags
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/gtk-doc.m4:textproc/gtk-doc \
-		intltool-update:textproc/intltool \
-		itstool:textproc/itstool \
+BUILD_DEPENDS=	itstool:textproc/itstool \
 		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
 LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libxapp.so:x11/xapp \
 		libpeas-1.0.so:devel/libpeas
 RUN_DEPENDS=	yelp:x11/yelp
 
 USES=		autoreconf compiler:c++11-lang desktop-file-utils gettext-tools \
 		gmake gnome libtool localbase pkgconfig xorg
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_GNOME=	atk cairo gdkpixbuf2 gtk30 introspection pango
+USE_GNOME=	atk cairo gdkpixbuf2 gtk30 intltool introspection pango
 USE_XORG=	x11
 GLIB_SCHEMAS=	org.x.viewer.enums.xml org.x.viewer.gschema.xml
 
 OPTIONS_DEFINE=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
 OPTIONS_DEFAULT=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
 XMP_DESC=	Adobe Extensible Metadata Platform support
 OPTIONS_SUB=	yes
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--without-libjpeg
 
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_OFF=	--without-cms
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_CONFIGURE_OFF=	--without-libexif
 
 LIBRSVG2_USE=		GNOME=librsvg2
 LIBRSVG2_CONFIGURE_OFF=	--without-librsvg
 
 XMP_LIB_DEPENDS=	libexempi.so:textproc/exempi
 XMP_CONFIGURE_OFF=	--without-xmp
 
 .include <bsd.port.mk>
diff --git a/graphics/xviewer/files/patch-Makefile.am b/graphics/xviewer/files/patch-Makefile.am
new file mode 100644
index 000000000000..22ce638adbaf
--- /dev/null
+++ b/graphics/xviewer/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2021-12-31 13:12:10 UTC
++++ Makefile.am
+@@ -2,7 +2,7 @@ endif
+ jpeg_DIRS = jpegutils
+ endif
+ 
+-SUBDIRS = $(jpeg_DIRS) cut-n-paste src po help data doc
++SUBDIRS = $(jpeg_DIRS) cut-n-paste src po help data
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
diff --git a/graphics/xviewer/files/patch-configure.ac b/graphics/xviewer/files/patch-configure.ac
new file mode 100644
index 000000000000..609e581c4666
--- /dev/null
+++ b/graphics/xviewer/files/patch-configure.ac
@@ -0,0 +1,21 @@
+--- configure.ac.orig	2021-12-31 13:12:10 UTC
++++ configure.ac
+@@ -43,7 +43,6 @@ PKG_PROG_PKG_CONFIG
+ 
+ PKG_PROG_PKG_CONFIG
+ 
+-GTK_DOC_CHECK(1.16)
+ 
+ AC_CHECK_FUNCS(strptime)
+ 
+@@ -350,10 +349,6 @@ data/icons/scalable/Makefile
+ data/icons/32x32/Makefile
+ data/icons/48x48/Makefile
+ data/icons/scalable/Makefile
+-doc/Makefile
+-doc/reference/Makefile
+-doc/reference/version.xml
+-doc/reference/xviewer-docs.xml
+ ])
+ 
+ AC_OUTPUT