diff --git a/xmlrpc3.spec b/xmlrpc3.spec
index c9908c6..faa85e0 100644
--- a/xmlrpc3.spec
+++ b/xmlrpc3.spec
@@ -32,7 +32,7 @@
 
 Name:       xmlrpc3
 Version:    3.1.3
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
 Group:      Development/Libraries
@@ -47,7 +47,6 @@ Patch0:     %{name}-addjunitandservletapitotestpom.patch
 Patch1:     %{name}-client-addosgimanifest.patch
 Patch2:     %{name}-common-addosgimanifest.patch
 
-BuildRequires:  dos2unix
 BuildRequires:  maven2 >= 2.0.4
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-compiler-plugin
@@ -62,25 +61,14 @@ BuildRequires:  maven-site-plugin
 BuildRequires:  ws-jaxme
 BuildRequires:  ws-commons-util
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  servletapi5
-BuildRequires:	tomcat5
+BuildRequires:  servlet25
+BuildRequires:	tomcat6
 BuildRequires:  junit
 BuildRequires:  jakarta-commons-httpclient
-BuildRequires:  apache-commons-codec >= 1.3
+BuildRequires:  apache-commons-logging
 BuildRequires:  jsse
-Requires:       jpackage-utils >= 0:1.6
-Requires:       servletapi5
-Requires:       junit
-Requires:       jakarta-commons-httpclient
-Requires:       apache-commons-codec >= 1.3
-Requires:       jsse
-Requires:       ws-jaxme
-Requires:       ws-commons-util
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 BuildArch:    noarch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -100,6 +88,12 @@ Javadoc for %{name}.
 Summary:    Common classes for XML-RPC client and server implementations
 Group:      Development/Libraries
 Obsoletes:  %{name}-common-devel <= %{version}
+Requires:   ws-jaxme
+Requires:   ws-commons-util
+Requires:   jpackage-utils >= 0:1.6
+Requires:   apache-commons-logging
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
 
 %description common
 %{summary}.
@@ -108,6 +102,7 @@ Obsoletes:  %{name}-common-devel <= %{version}
 Summary:    XML-RPC client implementation
 Group:      Development/Libraries
 Requires:   %{name}-common
+Requires:   jakarta-commons-httpclient
 Obsoletes:  %{name}-client-devel <= %{version}
 
 %description client
@@ -116,7 +111,9 @@ Obsoletes:  %{name}-client-devel <= %{version}
 %package server
 Summary:    XML-RPC server implementation
 Group:      Development/Libraries
-Requires:   %{name}-common
+Requires:   %{name}-client
+Requires:   junit
+Requires:   servlet25
 Obsoletes:  %{name}-server-devel <= %{version}
 
 %description server
@@ -134,11 +131,12 @@ pushd common
 %patch2 -b .sav
 popd
 
-dos2unix LICENSE.txt
+sed -i 's/\r//' LICENSE.txt
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
+# ignore test failure because server part needs network
 mvn-jpp \
   -e \
   -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
@@ -152,13 +150,11 @@ rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 client/target/%{mainname}-client-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-client-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar
 install -m 644 server/target/%{mainname}-server-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-server-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar
 install -m 644 common/target/%{mainname}-common-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-common-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-common.jar
 
 # install maven pom files
 install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
@@ -173,11 +169,8 @@ install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server
 %add_to_maven_depmap org.apache.xmlrpc %{mainname}-server %{version} JPP %{name}-server
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %post common
 %update_maven_depmap
@@ -185,6 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun common
 %update_maven_depmap
 
+%pre javadoc
+# workaround rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 %files javadoc
 %defattr(-,root,root,-)
 %doc LICENSE.txt
@@ -197,21 +195,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mavenpomdir}/JPP-%{name}-common.pom
 %{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}-common.jar
-%{_javadir}/%{name}-common-%{version}.jar
 
 %files client
 %defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-%{name}-client.pom
 %{_javadir}/%{name}-client.jar
-%{_javadir}/%{name}-client-%{version}.jar
 
 %files server
 %defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-%{name}-server.pom
 %{_javadir}/%{name}-server.jar
-%{_javadir}/%{name}-server-%{version}.jar
 
 %changelog
+* Thu Dec  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.1.3-4
+- Fix Requires (split to sub-packages, change codec to logging)
+- Make jars and javadocs versionless
+
 * Wed Sep 29 2010 Alexander Kurtakov <akurtako@redhat.com> 3.1.3-3
 - Add missing maven-site-plugin BR.