diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 8f59ab43c69..a25eb9fd1f1 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,29 +1,35 @@
 # Template file for 'hub'
 pkgname=hub
-version=2.7.1
+version=2.9.0
 revision=1
 build_style=go
 go_import_path=github.com/github/hub
-hostmakedepends="git ruby-ronn"
+hostmakedepends="git groff"
 short_desc="Command line tool for Github"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://hub.github.com/"
 changelog="https://github.com/github/hub/releases"
 distfiles="https://github.com/github/hub/archive/v${version}.tar.gz"
-checksum=83fac8b47b2f56da1e7366688df4bd0eeb5fa20bde5d3de39792ea1cc1d15cd4
+checksum=48aa49cd6eb14a4ea243019323bb0b8b193fc8c3fbdcc3597f87cca11ae0394c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" hub"
 fi
 
 post_install() {
-	# Don't use bundled ronn
-	mkdir bin
-	ln -s /usr/bin/ronn bin/ronn
-
 	if [ "$CROSS_BUILD" ]; then
 		vsed -e 's|bin/hub|hub|g' -i Makefile
+
+		(
+			# Build md2roff ourselves since it needs to be executed on
+			# the host, also use a subshell so we don't modify the
+			# environment of the main program
+			unset GOARCH GOARM GOOS
+			export CC="$CC_FOR_BUILD"
+			export CFLAGS="$CFLAGS_FOR_BUILD"
+			go build -o bin/md2roff github.com/github/hub/md2roff-bin
+		)
 	fi
 
 	make man-pages