diff --git a/srcpkgs/groff/groff-doc.template b/srcpkgs/groff/groff-doc.template
index 3c9469fdcf..0b029a27ae 100644
--- a/srcpkgs/groff/groff-doc.template
+++ b/srcpkgs/groff/groff-doc.template
@@ -1,14 +1,8 @@
 # Template file for 'groff-doc'.
 #
-short_desc="${sourcepkg} documentation"
-long_desc="${long_desc}
-
- This package contains the GNU Groff documentation."
-
+short_desc="${short_desc} - documentation"
 noarch=yes
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/share/doc usr/share
 }
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index 8416611d03..26f0f79d27 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,29 +1,42 @@
 # Template file for 'groff'
 pkgname=groff
-version=1.21
-homepage="http://www.gnu.org/software/groff/groff.html"
-distfiles="http://ftp.gnu.org/gnu/groff/groff-$version.tar.gz"
-build_style=gnu-configure
-configure_args="--without-x"
-revision=3
-makedepends="bison zlib-devel"
+version=1.22.2
+revision=1
+makedepends="perl bison zlib-devel"
+crossmakedepends="zlib-devel"
 short_desc="The GNU troff text-formatting system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=344e6af5480e7ab4ec51e2a2ed10acd69ba3e062d285b6d5f6d49fb5ed2f9f7a
-long_desc="
- The Groff package contains the traditional UN*X text formatting tools troff,
- nroff, tbl, eqn, and pic. These utilities, together with the man package,
- are essential for displaying the online manual pages. Output can be produced
- in a number of formats including plain ASCII and PostScript.
-
- All the standard macro packages are supported. A number of other utilities
- are also included together with several fonts."
-
+homepage="http://www.gnu.org/software/groff/groff.html"
+distfiles="http://ftp.gnu.org/gnu/groff/groff-${version}.tar.gz"
+checksum=380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076
 subpackages="groff-doc"
 
+if [ "$XBPS_CROSS_TRIPLET" ]; then
+	makedepends="perl bison groff"
+fi
+
+do_configure() {
+	if [ "$XBPS_CROSS_TRIPLET" ]; then
+		sed -i \
+			-e '/^GROFFBIN=/s:=.*:=/usr/bin/groff:' \
+			-e '/^TROFFBIN=/s:=.*:=/usr/bin/troff:' \
+			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+			-e '/^GROFF_BIN_DIR=/s:=.*:=:' \
+			contrib/*/Makefile.sub \
+			doc/Makefile.in \
+			doc/Makefile.sub
+	fi
+	./configure ${CONFIGURE_SHARED_ARGS} --without-x --disable-rpath
+}
+
+do_build() {
+	make TROFFBIN=troff GROFFBIN=groff GROFF_BIN_PATH= ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} install
 
-post_install() {
 	# Remove unused stuff.
 	rm -rf ${DESTDIR}/usr/lib