diff --git a/.cvsignore b/.cvsignore
index e69de29..0bb010d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+commons-lang-2.5-src.tar.gz
diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec
new file mode 100644
index 0000000..ee19001
--- /dev/null
+++ b/apache-commons-lang.spec
@@ -0,0 +1,131 @@
+
+%global base_name       lang
+%global short_name      commons-%{base_name}
+
+Name:           apache-%{short_name}
+Version:        2.5
+Release:        2%{?dist}
+Summary:        Provides a host of helper utilities for the java.lang API
+License:        ASL 2.0
+Group:          Development/Libraries
+URL:            http://commons.apache.org/%{base_name}
+Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+BuildArch:      noarch
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils >= 0:1.7.2
+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-idea
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-site
+
+Requires:       java >= 1:1.6.0
+Requires:       jpackage-utils >= 0:1.6
+Requires(post):    jpackage-utils
+Requires(postun):  jpackage-utils
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# This should go away with F-17
+Provides:       jakarta-commons-lang = 0:%{version}-%{release}
+Obsoletes:      jakarta-commons-lang <= 0:2.4
+
+%description
+The standard Java libraries fail to provide enough methods for
+manipulation of its core classes. The Commons Lang Component provides
+these extra methods.
+The Commons Lang Component provides a host of helper utilities for the
+java.lang API, notably String manipulation methods, basic numerical
+methods, object reflection, creation and serialization, and System
+properties. Additionally it contains an inheritable enum type, an
+exception structure that supports multiple types of nested-Exceptions
+and a series of utilities dedicated to help with building methods, such
+as hashCode, toString and equals.
+
+%package        javadoc
+Summary:        API documentation for %{name}
+Group:          Documentation
+Requires:       jpackage-utils
+
+Obsoletes:      jakarta-%{short_name}-javadoc <= 0:2.4
+
+%description    javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{short_name}-%{version}-src
+sed -i 's/\r//' *.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 %{base_name} %{base_name} %{version} JPP %{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 PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
+%{_javadir}/*
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.5-2
+- Added export for MAVEN_LOCAL_REPO and mkdir
+- Added more add_to_maven_depmap to assure backward compatibility
+- Add symlink to short_name.jar
+
+* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.5-1
+- Rename and rebase of jakarta-commons-lang
+- Re-did whole spec file to use maven, dropped gcj support
+
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..0a869ed
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+apache-commons-lang-2_5-2_fc12:HEAD:apache-commons-lang-2.5-2.fc12.src.rpm:1273750673
diff --git a/sources b/sources
index e69de29..204448e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e96700da2046aa31a2c39839cf7b6cc9  commons-lang-2.5-src.tar.gz