diff --git a/.cvsignore b/.cvsignore
index e69de29..cc5bfcc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+ant-contrib-1.0b2-src.tar.gz
diff --git a/ant-contrib-antservertest.patch b/ant-contrib-antservertest.patch
new file mode 100644
index 0000000..a486712
--- /dev/null
+++ b/ant-contrib-antservertest.patch
@@ -0,0 +1,27 @@
+--- test/resources/antserver/antservertest.xml.orig	2005-02-03 19:04:11.000000000 -0500
++++ test/resources/antserver/antservertest.xml	2006-06-01 11:57:05.000000000 -0400
+@@ -3,8 +3,8 @@
+ 
+     <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+ 
+-    <property name="server.host" value="localhost" />
+-    <property name="server.port" value="17000" />
++    <property name="server.host" value="127.0.0.1" />
++    <property name="server.port" value="23456" />
+ 
+     <target name="default">
+     </target>
+@@ -124,11 +124,11 @@
+                     <try>
+                         <antcall target="${test.target}" />
+                     </try>
+-                    <finally>
++                    <catch>
+                         <remoteant machine="${server.host}" port="${server.port}">
+                             <shutdown />
+                         </remoteant>
+-                    </finally>
++                    </catch>
+                 </trycatch>
+             </sequential>
+         </parallel>
diff --git a/ant-contrib-build_xml.patch b/ant-contrib-build_xml.patch
new file mode 100644
index 0000000..15150a5
--- /dev/null
+++ b/ant-contrib-build_xml.patch
@@ -0,0 +1,89 @@
+--- build.xml.old	2006-07-20 14:29:08.000000000 -0400
++++ build.xml	2006-07-20 14:29:35.000000000 -0400
+@@ -53,6 +53,8 @@
+   <property name="contrib.jar" location="${lib}/${jar.name}"/>
+   <property name="jar.main.class" value="net.sf.antcontrib.AntContribVersion"/>
+ 
++  <property name="bcel.jar" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />
++
+   <!--
+   ######################################################
+   ### Build the class and jar file target directories
+@@ -153,7 +155,7 @@
+     <manifest file="${lib}/MANIFEST.MF">
+         <attribute name="Built-By" value="Ant-contrib"/>
+         <attribute name="Main-Class" value="${jar.main.class}"/>
+-        <attribute name="Class-Path" value="${jar.name}"/>
++        <!--<attribute name="Class-Path" value="${jar.name}"/>-->
+         <!--attribute name="Specification-Title" value="${spec.title}"/>
+         <attribute name="Specification-Version" value="${spec.version}"/>
+         <attribute name="Specification-Vendor" value="${spec.vendor}"/-->
+@@ -349,8 +351,8 @@
+       </classpath>
+     </junit>
+ 
+-      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />
+-      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />
++<!--      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />-->
++<!--      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />-->
+   </target>
+ 
+   <target name="test-all" depends="compile-tests">
+@@ -373,7 +375,7 @@
+ 
+   <target name="get-jar-deps">
+       <antcall target="get-dep-maybe">
+-          <param name="dep.src" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />
++		  <param name="dep.src" value="${bcel.jar}" />
+           <param name="dep.dest" value="${runlib}/bcel-5.1.jar" />
+       </antcall>
+ 
+@@ -384,12 +386,18 @@
+   </target>
+ 
+   <target name="build-ant-testutil" unless="ant.build.testutil.available">
+-    <unzip src="${build.ant.dir}/${ant.src.file}"
+-             dest="${build.ant.dir}">
+-          <patternset>
+-              <include name="${ant.unzip.dir}/src/testcases/org/apache/tools/ant/BuildFileTest.java"/>
+-          </patternset>
+-    </unzip>
++    <gunzip src="${build.ant.dir}/${ant.src.file}"
++			dest="${build.ant.dir}" />
++
++    <delete file="${build.ant.dir}/${ant.src.file}" />
++
++    <untar src="${build.ant.dir}/${ant.src.tar.file}"
++           dest="${build.ant.dir}" />
++
++    <delete file="${build.ant.dir}/${ant.src.tar.file}" />
++    <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xml-apis.jar" />
++    <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xercesImpl.jar" />
++	
+ 
+     <mkdir dir="${testclasses}" />
+     <javac srcdir="${build.ant.dir}/${ant.unzip.dir}/src/testcases"
+@@ -408,9 +416,12 @@
+       <property name="build.ant.dir"
+                 value="build/ant" />
+       <property name="ant.download.version"
+-                value="1.6.2" />
++                value="1.6.5" />
+       <property name="ant.src.file"
+-                value="apache-ant-${ant.download.version}-src.zip" />
++			  value="apache-ant-${ant.download.version}-src.tar.gz" />
++	  <property name="ant.src.tar.file"
++			  value="apache-ant-${ant.download.version}-src.tar" />
++
+       <property name="ant.unzip.dir"
+                 value="apache-ant-${ant.download.version}" />
+ 
+@@ -418,7 +429,7 @@
+ 
+       <get dest="${build.ant.dir}/${ant.src.file}"
+            usetimestamp="true"
+-           src="http://archive.apache.org/dist/ant/source/${ant.src.file}">
++		   src="file://${basedir}/../../../SOURCES/${ant.src.file}">
+       </get>
+ 
+       <available property="ant.build.testutil.available"
diff --git a/ant-contrib.spec b/ant-contrib.spec
new file mode 100644
index 0000000..678dadc
--- /dev/null
+++ b/ant-contrib.spec
@@ -0,0 +1,166 @@
+%define gcj_support 1
+%define beta_number b2
+
+Summary:        Collection of tasks for Ant
+Name:           ant-contrib 
+Version:        1.0
+Release:        0.3.%{beta_number}
+License:        Apache Software License
+URL:            http://ant-contrib.sourceforge.net/
+Group:          Development/Libraries
+Source0:        http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}%{beta_number}-src.tar.gz
+Patch0:         ant-contrib-build_xml.patch
+Patch2:         ant-contrib-antservertest.patch
+BuildRequires:  jpackage-utils >= 1.5
+BuildRequires:  junit >= 3.8.0
+BuildRequires:  ant-junit >= 1.6.2
+BuildRequires:  ant-nodeps >= 1.6.2
+BuildRequires:  xerces-j2
+BuildRequires:  bcel >= 5.0
+%if %{gcj_support}
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+%else
+BuildRequires:  java-devel >= 1.4.2
+Requires:       java >= 1.4.2
+%endif
+Requires:       junit >= 3.8.0
+Requires:       ant >= 1.6.2
+Requires:       xerces-j2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+%description
+The Ant-Contrib project is a collection of tasks 
+(and at one point maybe types and other tools) 
+for Apache Ant.
+
+%package        javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation
+
+%description    javadoc
+%{summary}.
+
+%prep
+%setup -q  -n %{name}
+rm -rf test/src/net/sf/antcontrib/antclipse
+
+%patch0
+%patch2
+sed -i "s/\r//" manual/tasks/foreach.html manual/tasks/for.html
+
+%build
+export JUNIT_VER=`rpm -q --queryformat='%%{version}' junit`
+mkdir -p test/lib
+(cd test/lib
+ln -s $(find-jar junit-$(JUNIT_VER)) junit-$(JUNIT_VER).jar
+)
+export OPT_JAR_LIST="ant/ant-junit junit ant/ant-nodeps"
+export CLASSPATH=
+CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH
+echo $ANT_HOME
+ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -Dpm 644 build/lib/%{name}.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# javadoc
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+rm -rf build/docs/api
+
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/*.jar
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}
+%endif
+%doc build/docs/LICENSE.txt
+%doc build/docs/tasks/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
+# -----------------------------------------------------------------------------
+
+%changelog
+* Sat Aug 02 2006 Igor Foox <ifoox@redhat.com> - 1.0-0.3.b2
+- Removed unneccessary 0 epoch from required packages.
+- Fixed dependance on specifically version 3.8.1 of junit.
+
+* Tue Jun 27 2006 Igor Foox <ifoox@redhat.com> - 1.0-0.2.b2
+- Removed Class-Path from ant-contrib.jar file.
+- Renamed patches.
+
+* Tue Jun 27 2006 Igor Foox <ifoox@redhat.com> - 1.0-0.1.b2
+- Fixed release number to reflect beta status
+- Removed Distribution and Vendor tags
+- Fixed duplication in postun section
+- Removed patch3, and used sed to fix line-endings instead
+
+* Tue Jun 27 2006 Igor Foox <ifoox@redhat.com> - 1.0-1.b2
+- Changed release-version to comply with FE standards
+- Consolidated into -manual into main package
+- Removed ghosting of the manual symlink
+- Removed Epoch
+- Run dos2unix over some manual files that have windows line endings
+- Changed group for docs to Documentation
+- Remove unused Source1
+- Set Source0 to valid URL instead of just a file name
+- Fix indentation
+- Remove {push,pop}d and -c from %%setup
+- Changed %%defattr in the %%files section to standard (-,root,root,-)
+
+* Thu Jun 1 2006 Igor Foox <ifoox@redhat.com> - 0:1.0b2-1jpp_1fc
+- Update to version 1.0b2
+- Added native compilation
+- Changed BuildRoot to what Extras expects
+
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.6-4jpp
+- Upgrade to ant-1.6.2
+- BuildReq/Req ant = 0:1.6.2
+- Relax some other requirements
+
+* Thu Jun 03 2004 Paul Nasrat <pauln@truemesh.com> - 0:0.6-3jpp
+- Fix missing buildrequires
+
+* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.6-2jpp
+- Upgrade to Ant 1.6.X
+
+* Wed Mar 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.6-1jpp
+- First JPackage release
diff --git a/sources b/sources
index e69de29..d10ff97 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+66511dddcef3dc9798db33dbaca0d3de  ant-contrib-1.0b2-src.tar.gz