diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index d423e40ddf..fc6ef1a31e 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,22 +1,37 @@
 # Template file for 'gendesk'
 pkgname=gendesk
-version=0.4.2
-revision=2
-makedepends="go>=1.0.2"
+version=0.6.2
+revision=1
+hostmakedepends="go git mercurial"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" go-cross-linux"
+fi
 short_desc="Utility to generate .desktop files and download icons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="http://roboticoverlords.org/gendesk/"
-distfiles="http://roboticoverlords.org/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=10b2a294f5d57fcc2fd8612ca9cba7f0f82af03b1bd38d93a3ef757689d20a8a
+distfiles="https://github.com/xyproto/${pkgname}/archive/${version}.tar.gz
+ http://roboticoverlords.org/images/default.png"
+skip_extraction="default.png"
+checksum="a01ecee04e2397f263b25b1ec94d642fe7f5b8b67eabc6123a923072dd130602
+ 4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837"
 
 do_build() {
-	${XBPS_FETCH_CMD} http://roboticoverlords.org/images/default.png
-	go build
+        case "$XBPS_TARGET_MACHINE" in
+                arm*) export GOARCH=arm;;
+                i686*) export GOARCH=386;;
+                x86_64*) export GOARCH=amd64;;
+        esac
+
+	export GOPATH="$PWD/gopath"
+	go get -v code.google.com/p/goconf/conf
+	go get -v github.com/xyproto/textgui
+	go build -v
 }
 
 do_install() {
-	vinstall ${pkgname}-${version} 755 usr/bin ${pkgname}
-	vinstall default.png 644 usr/share/pixmaps
-	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+	vbin ${pkgname}-${version} ${pkgname}
+	vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/default.png 644 usr/share/pixmaps
+	vman ${pkgname}.1
+	vlicense LICENSE
 }