diff --git a/groovy/Makefile b/groovy/Makefile
index e71dcdd921..970e235919 100644
--- a/groovy/Makefile
+++ b/groovy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/09/29 00:50:40 asau Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/27 10:13:22 ryo-on Exp $
 #
 
-DISTNAME=	groovy-binary-1.8.2
+DISTNAME=	groovy-binary-2.0.6
 PKGNAME=	${DISTNAME:S/binary-//}
 CATEGORIES=	lang
 MASTER_SITES=	http://dist.groovy.codehaus.org/distributions/
diff --git a/groovy/PLIST b/groovy/PLIST
index 769700b315..19ce23d490 100644
--- a/groovy/PLIST
+++ b/groovy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/09/22 03:17:10 ryo-on Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/12/27 10:13:22 ryo-on Exp $
 bin/grape
 bin/groovy
 bin/groovyConsole
@@ -9,32 +9,50 @@ bin/java2groovy
 bin/startGroovy
 lib/java/${PKGNAME}/conf/groovy-starter.conf
 lib/java/${PKGNAME}/groovy-all-${PKGVERSION}.jar
-lib/java/${PKGNAME}/lib/ant-${PKGVERSION}.jar
-lib/java/${PKGNAME}/lib/ant-antlr-${PKGVERSION}.jar
-lib/java/${PKGNAME}/lib/ant-junit-${PKGVERSION}.jar
-lib/java/${PKGNAME}/lib/ant-launcher-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/ant-1.8.4.jar
+lib/java/${PKGNAME}/lib/ant-antlr-1.8.4.jar
+lib/java/${PKGNAME}/lib/ant-junit-1.8.4.jar
+lib/java/${PKGNAME}/lib/ant-launcher-1.8.4.jar
 lib/java/${PKGNAME}/lib/antlr-2.7.7.jar
-lib/java/${PKGNAME}/lib/asm-3.2.jar
-lib/java/${PKGNAME}/lib/asm-analysis-3.2.jar
-lib/java/${PKGNAME}/lib/asm-commons-3.2.jar
-lib/java/${PKGNAME}/lib/asm-tree-3.2.jar
-lib/java/${PKGNAME}/lib/asm-util-3.2.jar
+lib/java/${PKGNAME}/lib/asm-4.0.jar
+lib/java/${PKGNAME}/lib/asm-analysis-4.0.jar
+lib/java/${PKGNAME}/lib/asm-commons-4.0.jar
+lib/java/${PKGNAME}/lib/asm-tree-4.0.jar
+lib/java/${PKGNAME}/lib/asm-util-4.0.jar
 lib/java/${PKGNAME}/lib/bsf-2.4.0.jar
 lib/java/${PKGNAME}/lib/commons-cli-1.2.jar
 lib/java/${PKGNAME}/lib/commons-logging-1.1.1.jar
-lib/java/${PKGNAME}/lib/extra166y-1.7.0.jar
-lib/java/${PKGNAME}/lib/gpars-0.11.jar
+lib/java/${PKGNAME}/lib/gpars-1.0.0.jar
 lib/java/${PKGNAME}/lib/${PKGNAME}.jar
+lib/java/${PKGNAME}/lib/groovy-ant-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-bsf-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-console-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-docgenerator-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-groovydoc-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-groovysh-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-jmx-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-json-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-jsr223-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-servlet-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-sql-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-swing-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-templates-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-test-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-testng-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/groovy-xml-${PKGVERSION}.jar
+lib/java/${PKGNAME}/lib/hamcrest-core-1.1.jar
 lib/java/${PKGNAME}/lib/ivy-2.2.0.jar
 lib/java/${PKGNAME}/lib/jansi-1.6.jar
-lib/java/${PKGNAME}/lib/jline-0.9.94.jar
+lib/java/${PKGNAME}/lib/jcommander-1.12.jar
+lib/java/${PKGNAME}/lib/jline-1.0.jar
 lib/java/${PKGNAME}/lib/jsp-api-2.0.jar
-lib/java/${PKGNAME}/lib/jsr166y-070108.jar
 lib/java/${PKGNAME}/lib/jsr166y-1.7.0.jar
-lib/java/${PKGNAME}/lib/junit-4.8.2.jar
+lib/java/${PKGNAME}/lib/junit-4.10.jar
+lib/java/${PKGNAME}/lib/qdox-1.12.jar
 lib/java/${PKGNAME}/lib/servlet-api-2.4.jar
+lib/java/${PKGNAME}/lib/testng-6.5.2.jar
 lib/java/${PKGNAME}/lib/xmlpull-1.1.3.1.jar
-lib/java/${PKGNAME}/lib/xstream-1.4.1.jar
+lib/java/${PKGNAME}/lib/xstream-1.4.2.jar
 share/doc/${PKGNAME}/ANTLR-LICENSE.txt
 share/doc/${PKGNAME}/ASM-LICENSE.txt
 share/doc/${PKGNAME}/CLI-LICENSE.txt
diff --git a/groovy/distinfo b/groovy/distinfo
index a03f7113ee..3fed52d9f0 100644
--- a/groovy/distinfo
+++ b/groovy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/09/22 03:17:10 ryo-on Exp $
+$NetBSD: distinfo,v 1.2 2012/12/27 10:13:22 ryo-on Exp $
 
-SHA1 (groovy-binary-1.8.2.zip) = d195d9fcf6b80cb5e371e5dbd790b9cc56965e45
-RMD160 (groovy-binary-1.8.2.zip) = 8550d465bf44e661e206587d71828a95840a67b9
-Size (groovy-binary-1.8.2.zip) = 16485900 bytes
+SHA1 (groovy-binary-2.0.6.zip) = f5fb6c874c910a5e27769c0e180e4e8bb6265750
+RMD160 (groovy-binary-2.0.6.zip) = b684b9e6d92ff63e366228a9e56451442e44fe04
+Size (groovy-binary-2.0.6.zip) = 28427109 bytes
 SHA1 (patch-bin_startGroovy) = 9ab09f98707599f634d13b3f3b2f2c5726f484d2