diff --git a/.cvsignore b/.cvsignore
index e69de29..378e22f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+commons-discovery-0.4-src.tar.gz
diff --git a/apache-commons-discovery-addosgimanifest.patch b/apache-commons-discovery-addosgimanifest.patch
new file mode 100644
index 0000000..e006fa3
--- /dev/null
+++ b/apache-commons-discovery-addosgimanifest.patch
@@ -0,0 +1,25 @@
+--- src/conf/MANIFEST.MF.orig	2006-11-30 00:15:55.000000000 +0100
++++ src/conf/MANIFEST.MF	2009-05-27 23:35:42.000000000 +0200
+@@ -6,4 +6,22 @@ Specification-Vendor: The Apache Softwar
+ Implementation-Title: @package@
+ Implementation-Vendor: The Apache Software Foundation
+ Implementation-Version: @version@
++Bundle-ManifestVersion: 2
++Bundle-Name: Jakarta-Commons Discovery
++Specification-Version: 1.0
++Bundle-SymbolicName: org.apache.commons.discovery
++Bundle-Version: 0.2.0.qualifier
++Bundle-Vendor: Eclipse.org
++Bundle-Localization: plugin
++Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Export-Package: org.apache.commons.discovery,
++ org.apache.commons.discovery.ant,
++ org.apache.commons.discovery.jdk,
++ org.apache.commons.discovery.log,
++ org.apache.commons.discovery.resource,
++ org.apache.commons.discovery.resource.classes,
++ org.apache.commons.discovery.resource.names,
++ org.apache.commons.discovery.tools
++Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)";resolution:=optional
++Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)"
+ 
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
new file mode 100644
index 0000000..e0047ec
--- /dev/null
+++ b/apache-commons-discovery.spec
@@ -0,0 +1,97 @@
+
+%global base_name  discovery
+%global short_name commons-%{base_name}
+
+Name:           apache-%{short_name}
+Version:        0.4
+Release:        3%{?dist}
+Epoch:          2
+Summary:        Apache Commons Discovery
+License:        ASL 2.0
+Group:          Development/Libraries
+URL:            http://commons.apache.org/%{base_name}
+Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Patch0:         %{name}-addosgimanifest.patch
+BuildArch:      noarch
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant
+BuildRequires:  ant-nodeps
+BuildRequires:  junit >= 0:3.7
+BuildRequires:  apache-commons-logging >= 1.1.1
+Requires:       apache-commons-logging >= 1.1.1
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# This should go away with F-17
+Provides:       jakarta-%{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes:      jakarta-%{short_name} <= 1:0.4
+
+%description
+The Discovery component is about discovering, or finding, implementations for
+pluggable interfaces.  Pluggable interfaces are specified with the intent that
+multiple implementations are, or will be, available to provide the service
+described by the interface.  Discovery provides facilities for finding and
+instantiating classes, and for lifecycle management of singleton (factory)
+classes.
+
+%package javadoc
+Group:          Documentation
+Summary:        API documentation for %{name}
+Requires:       jpackage-utils
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{short_name}-%{version}-src
+%patch0
+
+%build
+ant \
+  -Djunit.jar=%(find-jar junit) \
+  -Dlogger.jar=%(find-jar commons-logging) \
+  test.discovery dist
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s %{name}-%{version}.jar %{short_name}-%{version}.jar
+for jar in *-%{version}.jar;
+    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`;
+done
+popd # come back from javadir
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%{_javadir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Fri May  7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2:0.4-3
+- Add jpackage-utils as dep for -javadoc subpackage
+
+* Fri May  7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2:0.4-2
+- Fix provides
+
+* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.4-1
+- Rename and cleanup of jakarta-commons-discovery
+
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..e48f56e
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+apache-commons-discovery-0_4-3_fc12:HEAD:apache-commons-discovery-0.4-3.fc12.src.rpm:1273562629
diff --git a/sources b/sources
index e69de29..c452e46 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+1275ad4c6ce54b9323269e30dc42dd0e  commons-discovery-0.4-src.tar.gz