diff --git a/ant-antlr.changes b/ant-antlr.changes
index 0acf046..6af2b82 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Apr  9 10:42:30 UTC 2010 - mvyskocil@suse.cz
-
-- fix bnc#595144 - Compiled binary in ant
-  remove test.exe from source tarball
-
 -------------------------------------------------------------------
 Thu Mar 18 15:59:33 UTC 2010 - mvyskocil@suse.cz
 
diff --git a/ant-antlr.spec b/ant-antlr.spec
index 628d079..5210319 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package ant (Version 1.7.1)
+# spec file for package ant-antlr (Version 1.7.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -38,7 +38,7 @@ Summary:        Antlr Task for ant
 License:        Apache Software License ..
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
-Source0:        %{cvs_name}-%{version}-src-suse.tar.bz2
+Source0:        %{cvs_name}-%{version}-src.tar.bz2
 Source2:        %{cvs_name}-%{major_version}.ant.conf
 Source1:        http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
 Source3:        http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@@ -68,6 +68,7 @@ Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/an
 Source1000:     ant-antlr-prepare.sh
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch0:         apache-ant-jars.patch
+#Patch1:         apache-ant-bz163689.patch
 Patch2:         apache-ant-gnu-classpath.patch
 Patch3:         apache-ant-no-test-jar.patch
 # SUSE patches
diff --git a/ant.changes b/ant.changes
index c348539..573f476 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Apr  9 10:41:42 UTC 2010 - mvyskocil@suse.cz
-
-- fix bnc#595144 - Compiled binary in ant
-  remove test.exe from source tarball
-
 -------------------------------------------------------------------
 Thu Mar 18 15:58:41 UTC 2010 - mvyskocil@suse.cz
 
diff --git a/ant.spec b/ant.spec
index d602889..265d60d 100644
--- a/ant.spec
+++ b/ant.spec
@@ -37,8 +37,7 @@ Summary:        Antlr Task for ant
 License:        Apache Software License ..
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
-# rm src/etc/testcases/taskdefs/zip/test.exe
-Source0:        %{cvs_name}-%{version}-src-suse.tar.bz2
+Source0:        %{cvs_name}-%{version}-src.tar.bz2
 Source2:        %{cvs_name}-%{major_version}.ant.conf
 Source1:        http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
 Source3:        http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@@ -68,6 +67,7 @@ Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/an
 Source1000:     ant-antlr-prepare.sh
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch0:         apache-ant-jars.patch
+#Patch1:         apache-ant-bz163689.patch
 Patch2:         apache-ant-gnu-classpath.patch
 Patch3:         apache-ant-no-test-jar.patch
 # SUSE patches
diff --git a/apache-ant-1.7.1-src-suse.tar.bz2 b/apache-ant-1.7.1-src-suse.tar.bz2
deleted file mode 100644
index 239fd6a..0000000
--- a/apache-ant-1.7.1-src-suse.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:305176617ba522c6b272fdd77d2063cd6231f5fa43a97bcd02dab7a1a365b3ea
-size 6923290
diff --git a/apache-ant-1.7.1-src.tar.bz2 b/apache-ant-1.7.1-src.tar.bz2
new file mode 100644
index 0000000..8cf7882
--- /dev/null
+++ b/apache-ant-1.7.1-src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
+size 6979386