diff --git a/README.md b/README.md
index 4c3d495..f2f9ead 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # java-lucene
 
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
diff --git a/java-lucene-1.9-OSGi-MANIFEST.MF b/java-lucene-1.9-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..cf662ea
--- /dev/null
+++ b/java-lucene-1.9-OSGi-MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.0
+Created-By: 2.3 (IBM Corporation)
+Bundle-ManifestVersion: 2
+Export-Package: org.apache.lucene,org.apache.lucene.analysis,org.apach
+ e.lucene.analysis.de,org.apache.lucene.analysis.standard,org.apache.l
+ ucene.document,org.apache.lucene.index,org.apache.lucene.queryParser,
+ org.apache.lucene.search,org.apache.lucene.search.spans,org.apache.lu
+ cene.store,org.apache.lucene.util
+Bundle-Version: 1.9.1.v20080530-1600
+Bundle-SymbolicName: org.apache.lucene
+Bundle-Name: Apache Lucene
+Bundle-Localization: plugin
+Bundle-Vendor: Apache Software Foundation
+
diff --git a/java-lucene-1.9-analysis-OSGi-MANIFEST.MF b/java-lucene-1.9-analysis-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..e4a6858
--- /dev/null
+++ b/java-lucene-1.9-analysis-OSGi-MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 2.3 (IBM Corporation)
+Bundle-ManifestVersion: 2
+Export-Package: org.apache.lucene.analysis.br,org.apache.lucene.analys
+ is.cjk,org.apache.lucene.analysis.cn,org.apache.lucene.analysis.cz,or
+ g.apache.lucene.analysis.de,org.apache.lucene.analysis.el,org.apache.
+ lucene.analysis.fr,org.apache.lucene.analysis.nl,org.apache.lucene.an
+ alysis.ru
+Bundle-Version: 1.9.1.v20080530-1600
+Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visib
+ ility:=reexport
+Bundle-SymbolicName: org.apache.lucene.analysis
+Bundle-Name: Apache Lucene Analysis
+Bundle-Localization: plugin
+Bundle-Vendor: Apache Software Foundation
+
diff --git a/java-lucene-2.4.1-Xmax.patch b/java-lucene-2.4.1-Xmax.patch
new file mode 100644
index 0000000..1fe04cf
--- /dev/null
+++ b/java-lucene-2.4.1-Xmax.patch
@@ -0,0 +1,11 @@
+--- lucene-2.4.1/common-build.xml.Xmax	2009-10-16 11:40:25.093879193 -0600
++++ lucene-2.4.1/common-build.xml	2009-10-16 11:44:34.401817699 -0600
+@@ -480,8 +480,6 @@
+         source="${javac.source}"
+         target="${javac.target}">
+         <nested/>
+-        <compilerarg line="-Xmaxwarns 10000000"/>
+-        <compilerarg line="-Xmaxerrs 10000000"/>
+       </javac>
+     </sequential>
+   </macrodef>
diff --git a/java-lucene-2.4.1-db-javadoc.patch b/java-lucene-2.4.1-db-javadoc.patch
new file mode 100644
index 0000000..c849ce5
--- /dev/null
+++ b/java-lucene-2.4.1-db-javadoc.patch
@@ -0,0 +1,13 @@
+--- lucene-2.4.1/build.xml	2009-03-02 18:11:17.000000000 +0100
++++ lucene-2.4.1/build.xml-gil	2009-03-17 16:22:31.000000000 +0100
+@@ -239,8 +239,8 @@
+           <packageset dir="contrib/analyzers/src/java"/>
+           <packageset dir="contrib/ant/src/java"/>
+           <packageset dir="contrib/benchmark/src/java"/>
+-          <packageset dir="contrib/db/bdb-je/src/java"/>
+-          <packageset dir="contrib/db/bdb/src/java"/>
++	  <!-- <packageset dir="contrib/db/bdb-je/src/java"/> -->
++	  <!-- <packageset dir="contrib/db/bdb/src/java"/> -->
+           <packageset dir="contrib/highlighter/src/java"/>
+           <packageset dir="contrib/instantiated/src/java"/>
+           <packageset dir="contrib/lucli/src/java"/>
diff --git a/java-lucene-2.4.1-fixmanifests.patch b/java-lucene-2.4.1-fixmanifests.patch
new file mode 100644
index 0000000..e1340aa
--- /dev/null
+++ b/java-lucene-2.4.1-fixmanifests.patch
@@ -0,0 +1,11 @@
+--- lucene-2.4.1/common-build.xml.fixmanifests	2009-03-02 10:11:17.000000000 -0700
++++ lucene-2.4.1/common-build.xml	2009-10-16 11:39:18.387815444 -0600
+@@ -281,7 +281,7 @@
+ 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
+ 		<!-- impl version can be any string -->
+ 		<attribute name="Implementation-Version"
+-		           value="${version} ${svnversion} - ${DSTAMP} ${TSTAMP}"/>
++		           value="${version} - ${DSTAMP} ${TSTAMP}"/>
+ 		<attribute name="Implementation-Vendor"
+ 		           value="The Apache Software Foundation"/>
+ 		<attribute name="X-Compile-Source-JDK" 
diff --git a/java-lucene.spec b/java-lucene.spec
new file mode 100644
index 0000000..5eada6a
--- /dev/null
+++ b/java-lucene.spec
@@ -0,0 +1,349 @@
+%define        javahome    %{_jvmdir}/jdk
+Name:          java-lucene
+Version:       2.4.1
+Release:       3mamba
+Summary:       High-performance, full-featured text search engine
+Group:         Applications/Networking
+Vendor:        openmamba
+Distribution:  openmamba
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://lucene.apache.org/
+Source0:       http://www.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz
+Source1:       java-lucene-1.9-OSGi-MANIFEST.MF
+Source2:       java-lucene-1.9-analysis-OSGi-MANIFEST.MF
+Patch0:        java-lucene-2.4.1-db-javadoc.patch
+Patch1:        java-lucene-2.4.1-fixmanifests.patch
+Patch2:        java-lucene-2.4.1-Xmax.patch
+License:       Apache Software License 2.0
+BuildRequires: apache-ant
+BuildRequires: apache-ant-junit
+BuildRequires: jakarta-commons-beanutils
+BuildRequires: jakarta-commons-digester
+BuildRequires: jakarta-commons-logging
+BuildRequires: java-jline
+BuildRequires: jakarta-regexp
+%if "%{stage1}" != "1"
+BuildRequires: java-BDB3
+BuildRequires: java-bdb48
+%endif
+BuildRequires: javacc
+BuildRequires: java-junit3
+BuildRequires: java-tidy
+BuildRequires: jpackage-utils
+BuildRequires: xerces-j2
+BuildRequires: xml-commons-apis
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+%package contrib
+Summary:        %{name} contributed extensions
+Group:          Applications/Networking
+Requires:       %{name} = %{version}-%{release}
+
+%description contrib
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains %{name} contributed extensions
+
+%package contrib-db
+Summary:        %{name} contributed Berkeley DB extensions
+Group:          Applications/Networking
+Requires:       %{name} = %{version}-%{release}
+%if "%{stage1}" != "1"
+Requires:       java-bdb48
+Requires:       java-BDB3
+%endif
+
+%description contrib-db
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains %{name} contributed Berkeley DB extensions
+
+%package contrib-db-javadoc
+Summary:        Javadoc for %{name}-contrib-db
+Group:          Documentation
+
+%description contrib-db-javadoc
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains javadoc for %{name}-contrib-db
+
+%package demo
+Summary:        %{name} demonstration library
+Group:          Applications/Networking
+Requires:       %{name} = %{version}-%{release}
+
+%description demo
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains %{name} demonstration library
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation
+
+%description javadoc
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains javadoc for %{name}
+
+%package javadoc-jars
+Summary:        Javadoc for %{name} in jar file format
+Group:          Documentation
+
+%description javadoc-jars
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains javadoc for %{name} in jar file format
+
+%package        manual
+Group:          Documentation
+Summary:        Manual for %{name}
+
+%description    manual
+Jakarta Lucene is a high-performance, full-featured text search engine written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform.
+
+This package contains manual for %{name}.
+
+%prep
+%setup -q -n lucene-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+for j in $(find . -name "*.jar"); do
+	mv $j ${j}.no
+done
+
+%build
+mkdir -p docs
+mkdir -p lib
+unset JAVA_HOME
+export JAVA_HOME=%{javahome}
+%if "%{stage1}" != "1"
+export CLASSPATH=$(build-classpath bdb db jline jtidy regexp commons-digester \
+	commons-collections commons-logging xerces-j2 junit-3.8.2 xml-commons-apis ant/ant-junit)
+%else
+export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester \
+    commons-collections commons-logging xerces-j2 junit-3.8.2 xml-commons-apis ant/ant-junit)
+%endif
+ant -Dbuild.sysclasspath=first \
+  -Djavacc.home=%{_bindir}/javacc \
+  -Djavacc.jar=%{_javadir}/javacc.jar \
+  -Djavacc.jar.dir=%{_javadir} \
+  -Dversion=%{version} \
+  -Djavadoc.link=%{_javadocdir}/java \
+  package
+
+mkdir META-INF
+cp %{SOURCE1} META-INF/MANIFEST.MF
+zip -u build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
+cp %{SOURCE2} META-INF/MANIFEST.MF
+zip -u build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
+
+%install
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+
+mkdir -p %{buildroot}%{_javadir}
+
+install -m 644 build/lucene-core-%{version}.jar \
+	%{buildroot}%{_javadir}/lucene-%{version}.jar
+install -m 644 build/lucene-demos-%{version}.jar  \
+	%{buildroot}%{_javadir}/lucene-demos-%{version}.jar
+
+(
+	cd %{buildroot}%{_javadir}
+	ln -sf lucene-%{version}.jar lucene-core-%{version}.jar
+	for jar in *-%{version}.jar; do
+		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+	done
+)
+
+mkdir -p %{buildroot}%{_javadir}/lucene-contrib \
+	 %{buildroot}%{_javadocdir}/lucene-%{version}-jars
+
+# lucene-similarity-2.4.1-javadoc.jar ??
+for c in analyzers ant benchmark highlighter instantiated lucli memory misc queries regex similarity snowball spellchecker surround swing wikipedia wordnet xml-query-parser; do
+	install -m 644 build/contrib/$c/lucene-${c}-%{version}.jar \
+		%{buildroot}%{_javadir}/lucene-contrib
+#	if [ -e build/contrib/$c/lucene-${c}-%{version}-javadoc.jar ]; then
+#		install -m 644 build/contrib/$c/lucene-${c}-%{version}-javadoc.jar \
+#			%{buildroot}%{_javadocdir}/lucene-%{version}-jars
+#	fi
+done
+
+for c in bdb bdb-je; do
+	install -m 644 build/contrib/db/$c/lucene-${c}-%{version}.jar \
+		%{buildroot}%{_javadir}/lucene-contrib
+#	if [ -e build/contrib/db/$c/lucene-${c}-%{version}-javadoc.jar ]; then
+#		install -m 644 build/contrib/db/$c/lucene-${c}-%{version}-javadoc.jar \
+#			%{buildroot}%{_javadocdir}/lucene-%{version}-jars
+#	fi
+done
+
+(
+	cd %{buildroot}%{_javadir}/lucene-contrib
+	for jar in *-%{version}.jar; do
+		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+	done
+)
+
+#install -m 644 build/lucene-core-%{version}-javadoc.jar \
+#		%{buildroot}%{_javadocdir}/lucene-%{version}-jars
+#install -m 644 build/lucene-demos-%{version}-javadoc.jar \
+#		%{buildroot}%{_javadocdir}/lucene-%{version}-jars
+
+#(
+#	cd %{buildroot}%{_javadocdir}/lucene-%{version}-jars
+#	for jar in *-%{version}-javadoc.jar; do
+#		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+#	done
+#)
+
+
+mkdir -p %{buildroot}%{_javadocdir}/lucene-%{version}
+cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/lucene-%{version}
+ln -s lucene-%{version} %{buildroot}%{_javadocdir}/lucene
+
+mkdir -p %{buildroot}%{_datadir}/lucene-%{version}
+install -m 0644 build/luceneweb.war \
+	%{buildroot}%{_datadir}/lucene-%{version}
+
+rm -rf docs/skin/css
+rm -rf docs/skin/scripts
+rm -rf docs/skin/translations
+#%{_bindir}/aot-compile-rpm --exclude %{_datadir}/lucene-%{version}/luceneweb.war
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+
+%files
+%defattr(-,root,root)
+%{_javadir}/lucene-%{version}.jar
+%{_javadir}/lucene.jar
+%{_javadir}/lucene-core-%{version}.jar
+%{_javadir}/lucene-core.jar
+%{_datadir}/lucene-%{version}
+%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+
+%files contrib
+%defattr(-,root,root)
+%{_javadir}/lucene-contrib/lucene-analyzers-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-analyzers.jar
+%{_javadir}/lucene-contrib/lucene-ant-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-ant.jar
+%{_javadir}/lucene-contrib/lucene-benchmark-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-benchmark.jar
+%{_javadir}/lucene-contrib/lucene-highlighter-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-highlighter.jar
+%{_javadir}/lucene-contrib/lucene-instantiated-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-instantiated.jar
+%{_javadir}/lucene-contrib/lucene-lucli-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-lucli.jar
+%{_javadir}/lucene-contrib/lucene-memory-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-memory.jar
+%{_javadir}/lucene-contrib/lucene-misc-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-misc.jar
+%{_javadir}/lucene-contrib/lucene-queries-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-queries.jar
+%{_javadir}/lucene-contrib/lucene-regex-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-regex.jar
+%{_javadir}/lucene-contrib/lucene-similarity-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-similarity.jar
+%{_javadir}/lucene-contrib/lucene-snowball-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-snowball.jar
+%{_javadir}/lucene-contrib/lucene-spellchecker-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-spellchecker.jar
+%{_javadir}/lucene-contrib/lucene-surround-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-surround.jar
+%{_javadir}/lucene-contrib/lucene-swing-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-swing.jar
+%{_javadir}/lucene-contrib/lucene-wikipedia-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-wikipedia.jar
+%{_javadir}/lucene-contrib/lucene-wordnet-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-wordnet.jar
+%{_javadir}/lucene-contrib/lucene-xml-query-parser-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-xml-query-parser.jar
+%doc contrib/CHANGES.txt
+
+%files contrib-db
+%defattr(-,root,root)
+%{_javadir}/lucene-contrib/lucene-bdb-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-bdb-je-%{version}.jar
+%{_javadir}/lucene-contrib/lucene-bdb-je.jar
+%{_javadir}/lucene-contrib/lucene-bdb.jar
+
+#%files contrib-db-javadoc
+#%defattr(-,root,root)
+#%{_javadocdir}/lucene-%{version}-jars/lucene-bdb-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-bdb-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-bdb-je-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-bdb-je-javadoc.jar
+
+%files demo
+%defattr(-,root,root)
+%{_javadir}/lucene-demos-%{version}.jar
+%{_javadir}/lucene-demos.jar
+
+#%files javadoc-jars
+#%defattr(-,root,root)
+#%{_javadocdir}/lucene-%{version}-jars/lucene-analyzers-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-analyzers-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-ant-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-ant-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-benchmark-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-benchmark-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-core-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-core-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-demos-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-demos-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-highlighter-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-highlighter-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-instantiated-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-instantiated-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-lucli-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-lucli-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-memory-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-memory-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-misc-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-misc-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-queries-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-queries-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-regex-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-regex-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-snowball-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-snowball-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-spellchecker-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-spellchecker-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-surround-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-surround-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-swing-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-swing-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-wikipedia-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-wikipedia-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-wordnet-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-wordnet-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-xml-query-parser-%{version}-javadoc.jar
+#%{_javadocdir}/lucene-%{version}-jars/lucene-xml-query-parser-javadoc.jar
+
+%files javadoc
+%defattr(-,root,root)
+%{_javadocdir}/lucene-%{version}
+%{_javadocdir}/lucene
+
+%files manual
+%defattr(-,root,root)
+%doc docs
+
+%changelog
+* Tue Jan 18 2011 gil <puntogil@libero.it> 2.4.1-3mamba
+- rebuilt with new java-bdb48
+- rebuilt with java-openjdk
+
+* Thu Mar 18 2010 gil <puntogil@libero.it> 2.4.1-2mamba
+- added OSGi NANIFEST
+
+* Thu Mar 12 2009 gil <puntogil@libero.it> 2.4.1-1mamba
+- package created by autospec