diff --git a/.cvsignore b/.cvsignore
index e69de29..636cffb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+commons-net-2.0-src.tar.gz
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
new file mode 100644
index 0000000..486d56b
--- /dev/null
+++ b/apache-commons-net.spec
@@ -0,0 +1,127 @@
+
+%global base_name    net
+%global short_name   commons-%{base_name}
+
+Name:           apache-%{short_name}
+Version:        2.0
+Release:        3%{?dist}
+Summary:        Internet protocol suite Java library
+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
+BuildArch:      noarch
+BuildRequires:  jpackage-utils >= 0:1.7.2
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:  maven-plugin-bundle
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven2-plugin-antrun
+BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-idea
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+
+Requires:       java >= 1:1.6.0
+Requires:       jpackage-utils >= 0:1.7.2
+Requires(post):    jpackage-utils
+Requires(postun):  jpackage-utils
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
+Obsoletes:      jakarta-%{short_name} < 0:2.0-3
+
+%description
+This is an Internet protocol suite Java library originally developed by
+ORO, Inc.  This version supports Finger, Whois, TFTP, Telnet, POP3, FTP,
+NNTP, SMTP, and some miscellaneous protocols like Time and Echo as well
+as BSD R command support. The purpose of the library is to provide
+fundamental protocol access, not higher-level abstractions.
+
+%package javadoc
+Summary:    API documentation for %{name}
+Group:      Documentation
+Requires:   jpackage-utils
+
+Obsoletes:  jakarta-%{short_name}-javadoc < 0:2.0-3
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{short_name}-%{version}-src
+sed -i 's/\r//' NOTICE.txt LICENSE.txt
+
+
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+    install javadoc:javadoc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+
+pushd $RPM_BUILD_ROOT%{_javadir}
+for jar in *-%{version}*; do
+    ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
+    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+    ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
+done
+popd # come back from javadir
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{name}
+
+# following line is only for backwards compatibility. New packages
+# should use proper groupid org.apache.commons and also artifactid
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt
+%{_javadir}/*
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/*
+
+%changelog
+* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-3
+- Rename jakarta-commons-net to apache-commons-net and drop EPOCH
+- Build with maven
+- Clean up whole spec
+
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.0-2
+- Set maven.repo.local.
+
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.0-1
+- Update to upstream 2.0.
+
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..b12afd2
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+apache-commons-net-2_0-3_fc12:HEAD:apache-commons-net-2.0-3.fc12.src.rpm:1274260879
diff --git a/sources b/sources
index e69de29..1be86b8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+583630202369df3cf996cbdba4d8634b  commons-net-2.0-src.tar.gz