diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 52179d5a0f..c42b54a1ed 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,17 +1,34 @@
 # Template file for 'hub'
 pkgname=hub
-version=1.12.4
+version=2.2.0
 revision=1
 homepage="http://hub.github.com/"
 distfiles="https://github.com/github/hub/archive/v${version}.tar.gz"
-depends="ruby"
-hostmakedepends="ruby"
+hostmakedepends="go"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" go-cross-linux"
+fi
 short_desc="command line tool for Github"
 maintainer="Enno Boland <eb@s01.de>"
 license="MIT"
-checksum=b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117
-noarch=yes
+checksum=2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1
+
+do_build() {
+	case "$XBPS_TARGET_MACHINE" in
+		armv6*) export GOARCH=arm; export GOARM=6;;
+		armv7*) export GOARCH=arm; export GOARM=7;;
+		i686*) export GOARCH=386;;
+		x86_64*) export GOARCH=amd64;;
+	esac
+
+	export GOPATH="$PWD/gopath"
+	mkdir -p $GOPATH/src/github.com/github
+	ln -sf $PWD $GOPATH/src/github.com/github/${pkgname}
+	go build -v github.com/github/${pkgname}
+}
 
 do_install() {
-	rake DESTDIR=$DESTDIR prefix=/usr install
+	vbin ${pkgname}
+	vman man/${pkgname}.1
+	vlicense LICENSE
 }