diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 1b35b6f..d70d3f5 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,4 +1,5 @@
+AUX gradle-bin.bash-completion 319 RMD160 3cbb19f5bf357402733ee1bff6fbd95409f02d62 SHA1 70692531fdfa702e6666f0207bfa77283f1a8592 SHA256 40ff2f0b4a7eecc11dddd75006b94a12091e2a6a50aea9b7e6b5eacccfd2df6e
 DIST gradle-0.9.2-all.zip 37500427 RMD160 36cd6ad339f8e01aa05e495eab3e7f6fb596ba3e SHA1 1570f07ec6aea764de78b245cebb5cc64e059b26 SHA256 a9b33c1cb7c056a7bd26b588301ce80f0b6e3872d18b0f1cb80ab74af0e62404
 DIST gradle-1.0-milestone-6-all.zip 40706093 RMD160 08353a2537d8318027d1b056c5b2f35799014ded SHA1 4a061aba3558ba296a6ede1f469664e70763fe69 SHA256 c0f3041755be27d182c17288daec688b202b6e0062d2c9efb96eee4e93a50128
 EBUILD gradle-bin-0.9.2.ebuild 1111 RMD160 d6d3e04297d4d643c7b3eda7ea554d990f163404 SHA1 bda4bdf75db332125d6a7c7f54e0eef6119574a9 SHA256 8713d7db86e1fa7b10550d1b16c40858bf68c4a8df9b048135b76c086e77c7df
-EBUILD gradle-bin-1.0_pre6.ebuild 1132 RMD160 a3b2db9fb9e5d1778a899a920df7e07a3a527cce SHA1 7339c179940988026fb30e5946d74a453db64dc8 SHA256 fb06275897f495d521ede7697292d5ed66b55b99615cf813117348dc1755cab4
+EBUILD gradle-bin-1.0_pre6.ebuild 1214 RMD160 6988cbe538aca3363c1905a45892ac469c6b456b SHA1 930d012429aab6ce5c9e517f589ed3510e7b3938 SHA256 a1b0470025adbc5b34c83a3113f373d74b994d194dea3b3be50e3afec99b9ade
diff --git a/dev-java/gradle-bin/files/gradle-bin.bash-completion b/dev-java/gradle-bin/files/gradle-bin.bash-completion
new file mode 100644
index 0000000..0a972a1
--- /dev/null
+++ b/dev-java/gradle-bin/files/gradle-bin.bash-completion
@@ -0,0 +1,14 @@
+#!/bin/bash
+ 
+_gradle_complete()
+{
+    local cur tasks
+ 
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    tasks='clean compile dists javadoc jar test war'
+    cur=`echo $cur | sed 's/\\\\//g'`
+    COMPREPLY=($(compgen -W "${tasks}" ${cur} | sed 's/\\\\//g') )
+}
+ 
+complete -F _gradle_complete -o filenames gradle
diff --git a/dev-java/gradle-bin/gradle-bin-1.0_pre6.ebuild b/dev-java/gradle-bin/gradle-bin-1.0_pre6.ebuild
index 91b4ae8..d7caf1b 100644
--- a/dev-java/gradle-bin/gradle-bin-1.0_pre6.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-1.0_pre6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI="4"
 
-inherit java-pkg-2
+inherit java-pkg-2 bash-completion-r1
 
 MY_PN=${PN%%-bin}
 MY_PV=${PV/_pre/-milestone-}
@@ -31,6 +31,9 @@ src_unpack() {
 
 
 src_install() {
+	default
+	newbashcomp ${FILESDIR}/${PN}.bash-completion gradle
+
 	local gradle_home="${ROOT}/usr/share/${PN}"
 
 	insinto "${gradle_home}"
@@ -52,7 +55,7 @@ src_install() {
 
 	# jars
 	cd lib
-	for jar in *.jar; do 
+	for jar in *.jar; do
 		java-pkg_newjar ${jar} ${jar}
 	done