diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b2ecfe8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: gant
-# $Id$
-NAME := gant
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/gant-1.8.1-groovy7.patch b/gant-1.8.1-groovy7.patch
new file mode 100644
index 0000000..65bc24c
--- /dev/null
+++ b/gant-1.8.1-groovy7.patch
@@ -0,0 +1,14 @@
+Fix up a test so that it passes with groovy 1.7.0.
+
+diff -urp gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy
+--- gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy	2009-10-02 13:19:23.000000000 +0200
++++ gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy	2010-03-04 09:37:50.040561684 +0100
+@@ -555,7 +555,7 @@ target ( ${something} : '' ) { }
+ """
+     assertEquals ( -4 , processCmdLineTargets ( something ) )
+     assertEquals ( '' , output )
+-    assertEquals ( 'Standard input, line 2 -- Error evaluating Gantfile: No signature of method: org.codehaus.gant.IncludeTargets.multiply() is applicable for argument types: (java.lang.Class) values: ' + ( ( groovyMinorVersion < 6 ) ? '{class gant.targets.Clean}' : '[class gant.targets.Clean]' ) + '\n' , error )
++    assertEquals ( 'Standard input, line 2 -- Error evaluating Gantfile: No signature of method: org.codehaus.gant.IncludeTargets.multiply() is applicable for argument types: (java.lang.Class) values: ' + ( ( groovyMinorVersion < 7 ) ? '[class gant.targets.Clean]' : '[class gant.targets.Clean]\nPossible solutions: multiply(java.util.Map), multiply(java.util.Map)' ) + '\n' , error )
+   }
+   void testErrorNullPower ( ) {
+     script = """
diff --git a/gant-script b/gant-script
index 6161102..ad63012 100755
--- a/gant-script
+++ b/gant-script
@@ -4,5 +4,6 @@
 # Lubomir Rintel <lkundrak@v3.sk>
 
 BASE_JARS="$BASE_JARS gant"
+BASE_JARS="$BASE_JARS ../../lib/jvm/java/lib/tools"
 CLASS=gant.Gant
 . "$(dirname "$0")"/groovy
diff --git a/gant.spec b/gant.spec
index 0a931a2..fbc5f32 100644
--- a/gant.spec
+++ b/gant.spec
@@ -1,7 +1,7 @@
 %global build_jars                                                \\\
         -DgroovyJar=%(          build-classpath groovy          ) \\\
         -Dcommons-cliJar=%(     build-classpath commons-cli     ) \\\
-        -Dasm2Jar=%(            build-classpath asm2/asm2       ) \\\
+        -Dasm2Jar=%(            build-classpath objectweb-asm/asm ) \\\
         -DantlrJar=%(           build-classpath antlr           ) \\\
         -DantJar=%(             build-classpath ant             ) \\\
         -DjunitJar=%(           build-classpath junit           ) \\\
@@ -11,7 +11,7 @@
 
 Name:           gant
 Version:        1.8.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Groovy-based build system that uses Ant tasks
 
 Group:          Development/Tools
@@ -21,11 +21,12 @@ Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.
 Source1:        gant-script
 Patch0:         0001-Make-it-build-against-our-jars.patch
 Patch1:         0001-Fix-tests.patch
+Patch2:         gant-1.8.1-groovy7.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  groovy
 BuildRequires:  jakarta-commons-cli
-BuildRequires:  asm2
+BuildRequires:  objectweb-asm
 BuildRequires:  antlr
 BuildRequires:  ant
 BuildRequires:  junit
@@ -52,6 +53,7 @@ specify the rules.
 %setup -q
 %patch0 -p1 -b .build
 %patch1 -p1 -b .tests
+%patch2 -p1 -b .groovy7
 
 
 %build
@@ -111,6 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 5 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-4
+- Include JDK tools in classpath
+
+* Thu Mar 4 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-3
+- Fix build with Groovy 1.7
+
 * Thu Dec 24 2009 Lubomir Rintel <lkundrak@v3.sk> - 1.8.1-2
 - Add manual
 - Add bash completion configuration