diff --git a/SOURCES/xmlrpc-client-addosgimanifest.patch b/SOURCES/xmlrpc-client-addosgimanifest.patch
index 1b39a19..437d78f 100644
--- a/SOURCES/xmlrpc-client-addosgimanifest.patch
+++ b/SOURCES/xmlrpc-client-addosgimanifest.patch
@@ -10,7 +10,7 @@
 +              <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
 +              <Bundle-Version>${project.version}</Bundle-Version>
 +              <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+	      <Export-Package>org.apache.xmlrpc.client, org.apache.xmlrpc.client.util</Export-Package>
++	      <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client, org.apache.xmlrpc.client.util</Export-Package>
 +	      <Import-Package>javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
 +	      <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
 +	      <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
diff --git a/SOURCES/xmlrpc-server-addosgimanifest.patch b/SOURCES/xmlrpc-server-addosgimanifest.patch
new file mode 100644
index 0000000..af54e20
--- /dev/null
+++ b/SOURCES/xmlrpc-server-addosgimanifest.patch
@@ -0,0 +1,15 @@
+--- pom.xml	2014-07-07 11:24:52.668887604 -0400
++++ pom.xml.sav	2014-07-07 11:25:06.174916380 -0400
+@@ -48,6 +48,12 @@
+               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+               <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
+               <Implementation-Version>${project.version}</Implementation-Version>
++	      <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
++              <Bundle-Name>%Bundle-Name</Bundle-Name>
++              <Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
++	      <Bundle-Version>${project.version}</Bundle-Version>
++	      <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++	      <Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
+             </manifestEntries>
+           </archive>
+         </configuration>
diff --git a/SPECS/xmlrpc.spec b/SPECS/xmlrpc.spec
index bc113f4..e7d5538 100644
--- a/SPECS/xmlrpc.spec
+++ b/SPECS/xmlrpc.spec
@@ -4,7 +4,7 @@
 
 Name:       %{?scl_prefix}%{pkg_name}
 Version:    3.1.3
-Release:    8.14%{?dist}
+Release:    8.15%{?dist}
 Epoch:      1
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
@@ -14,6 +14,7 @@ Source0:    http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version
 Patch0:     %{pkg_name}-client-addosgimanifest.patch
 Patch1:     %{pkg_name}-common-addosgimanifest.patch
 Patch2:     %{pkg_name}-javax-methods.patch
+Patch3:     %{pkg_name}-server-addosgimanifest.patch
 
 BuildRequires:  %{?scl_prefix}maven-local
 BuildRequires:  %{?scl_prefix_maven}maven-resources-plugin
@@ -76,6 +77,9 @@ popd
 pushd common
 %patch1 -b .sav
 popd
+pushd server
+%patch3 -b .sav
+popd
 
 sed -i 's/\r//' LICENSE.txt
 
@@ -118,6 +122,9 @@ set -e -x
 
 
 %changelog
+* Thu Jul 02 2015 Michael Simacek <msimacek@redhat.com> - 1:3.1.3-8.15
+- Fix OSGi manifest metadata (rhbz#1238335)
+
 * Wed Jan 14 2015 Michal Srb <msrb@redhat.com> - 1:3.1.3-8.14
 - Fix directory ownership