diff --git a/ant-contrib.changes b/ant-contrib.changes
index d6b57c4..d5b46f3 100644
--- a/ant-contrib.changes
+++ b/ant-contrib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug  8 13:18:59 CEST 2008 - mvyskocil@suse.cz
+
+- Make junit testing optional and disable it by default  to break a build cycle
+  ant-antlr - bsf - jython - mysql-connector-java - ant-contrib ant-contrib
+
 -------------------------------------------------------------------
 Thu Jul 10 08:50:56 CEST 2008 - mvyskocil@suse.cz
 
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 5081f15..c92a94a 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -2,22 +2,30 @@
 # spec file for package ant-contrib (Version 1.0b2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 # icecream 0
 
+%define with_junit 0
 %define section free
 %define ant_version 1.7.0
 Summary:        Collection of tasks for Ant
 
 Name:           ant-contrib
 Version:        1.0b2
-Release:        2
+Release:        17
 License:        The Apache Software License
 Url:             http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries/Java
@@ -30,11 +38,11 @@ Patch2:         ant-contrib-BuildFileTest_java.patch
 BuildRequires:  jpackage-utils >= 1.6
 BuildRequires:  ant = %{ant_version}
 BuildRequires:  bcel >= 5.1
-%if %defined suse_version
 BuildRequires:  java-devel
+%if %{with_junit}
 BuildRequires:  ant-junit = %{ant_version}
-%endif
 Requires:       junit >= 3.8.1
+%endif
 Requires:       ant = %{ant_version}
 Requires:       bcel >= 5.1
 BuildArch:      noarch
@@ -94,7 +102,11 @@ cd ant-contrib
 %if %defined suse_version
 export CLASSPATH=$(build-classpath bcel junit)
 %endif
-ant all test
+ant \
+        all \
+%if %{with_junit}
+        test
+%endif
 
 %install
 # jars
@@ -139,6 +151,9 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug 08 2008 mvyskocil@suse.cz
+- Make junit testing optional and disable it by default  to break a build cycle
+  ant-antlr - bsf - jython - mysql-connector-java - ant-contrib ant-contrib
 * Thu Jul 10 2008 mvyskocil@suse.cz
 - Removed summary tags from description of subpackages.
 - Remove the ant-1.7.0 archive to reduce a size of source package and