diff --git a/sys-fs/tmsu/tmsu-0.6.1.ebuild b/sys-fs/tmsu/tmsu-0.6.1.ebuild
index aba0325..3241595 100644
--- a/sys-fs/tmsu/tmsu-0.6.1.ebuild
+++ b/sys-fs/tmsu/tmsu-0.6.1.ebuild
@@ -6,30 +6,35 @@ EAPI=6
 inherit golang-build
 
 EGO_PN="github.com/oniony/TMSU/"
-DESCRIPTION=""
-HOMEPAGE=""
+DESCRIPTION="Files tagger and virtual tag-based filesystem"
+HOMEPAGE="https://github.com/oniony/TMSU/wiki"
 SRC_URI="https://github.com/oniony/TMSU/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
+IUSE="test zsh-completion"
 
-RDEPEND="
+RDEPEND=""
+DEPEND="
 	dev-go/go-sqlite3
+	dev-lang/go
 	dev-libs/go-fuse
-	"
-DEPEND="dev-lang/go"
+	zsh-completion? ( app-shells/zsh )
+"
 
-S=${WORKDIR}/TMSU-${PV}
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} ${EGO_PN} || die
+src_unpack() {
+	default
+	mv TMSU-${PV} ${P} || die "Failed to move sorce directory."
 }
 
 src_install() {
-	golang_install_pkgs
-	newbin bin/TMSU tmsu
+	dobin misc/bin/*
+	doman misc/man/tmsu.*
+	newbin TMSU tmsu
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/_tmsu
+	fi
 }