diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index fc6ef1a31ec..dd60e19d585 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=0.6.2
-revision=1
+revision=2
 hostmakedepends="go git mercurial"
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" go-cross-linux"
@@ -18,19 +18,21 @@ checksum="a01ecee04e2397f263b25b1ec94d642fe7f5b8b67eabc6123a923072dd130602
 
 do_build() {
         case "$XBPS_TARGET_MACHINE" in
-                arm*) export GOARCH=arm;;
+                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"
-	go get -v code.google.com/p/goconf/conf
-	go get -v github.com/xyproto/textgui
-	go build -v
+	mkdir -p $GOPATH/src/github.com/xyproto
+	ln -s $PWD $GOPATH/src/github.com/xyproto/${pkgname}
+	go get -v github.com/xyproto/${pkgname}
+	go build -v github.com/xyproto/${pkgname}
 }
 
 do_install() {
-	vbin ${pkgname}-${version} ${pkgname}
+	vbin ${pkgname}
 	vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/default.png 644 usr/share/pixmaps
 	vman ${pkgname}.1
 	vlicense LICENSE