diff --git a/0002-Update-to-Plexus-Classworlds-2.5.patch b/0002-Update-to-Plexus-Classworlds-2.5.patch
new file mode 100644
index 0000000..d977139
--- /dev/null
+++ b/0002-Update-to-Plexus-Classworlds-2.5.patch
@@ -0,0 +1,71 @@
+From b0d63f977a529a2a782ebf9473e4333416b9cc96 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 5 Dec 2013 14:36:05 +0100
+Subject: [PATCH 2/2] Update to Plexus Classworlds 2.5
+
+---
+ .../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 4 ++--
+ .../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 4 ++--
+ pom.xml                                                               | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+index 1139d17..51e78ee 100644
+--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -189,7 +189,7 @@ public class ComponentDescriptor<T>
+         {
+             try
+             {
+-                roleClass = realm.loadClass( role );
++                roleClass = (Class) realm.loadClass( role );
+                 Thread.currentThread();
+             }
+             catch ( Throwable ignored )
+@@ -299,7 +299,7 @@ public class ComponentDescriptor<T>
+         {
+             try
+             {
+-                implementationClass = realm.loadClass( implementation );
++                implementationClass = (Class) realm.loadClass( implementation );
+                 Thread.currentThread();
+             }
+             catch ( Throwable ignored )
+diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+index ef23e19..35fd85e 100644
+--- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
++++ b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -189,7 +189,7 @@ public class ComponentDescriptor<T>
+         {
+             try
+             {
+-                roleClass = getRealm().loadClass( getRole() );
++                roleClass = (Class) getRealm().loadClass( getRole() );
+                 Thread.currentThread();
+             }
+             catch ( Throwable ignored )
+@@ -299,7 +299,7 @@ public class ComponentDescriptor<T>
+         {
+             try
+             {
+-                implementationClass = getRealm().loadClass( getImplementation() );
++                implementationClass = (Class) getRealm().loadClass( getImplementation() );
+                 Thread.currentThread();
+             }
+             catch ( Throwable ignored )
+diff --git a/pom.xml b/pom.xml
+index 890fca3..b262fe0 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -31,7 +31,7 @@
+   </scm>
+ 
+   <properties>
+-    <classWorldsVersion>2.2.2</classWorldsVersion>
++    <classWorldsVersion>2.5</classWorldsVersion>
+     <plexusUtilsVersion>1.4.5</plexusUtilsVersion>
+     <xbeanReflectVersion>3.4</xbeanReflectVersion>
+     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-- 
+1.8.1.4
+
diff --git a/plexus-containers.spec b/plexus-containers.spec
index 2813961..7b6a5d4 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -10,7 +10,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.5.5
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Containers for Plexus
 License:        ASL 2.0 and MIT
 URL:            http://plexus.codehaus.org/
@@ -23,6 +23,7 @@ Source2:        plexus-component-annotations-build.xml
 Source3:        plexus-containers-settings.xml
 
 Patch0:         0001-Fix-test-oom.patch
+Patch1:         0002-Update-to-Plexus-Classworlds-2.5.patch
 
 BuildArch:      noarch
 
@@ -34,15 +35,15 @@ BuildRequires:  maven-site-plugin
 BuildRequires:  maven-shared-invoker
 BuildRequires:  maven-release
 BuildRequires:  maven-plugin-plugin
-BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-classworlds >= 2.5
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-cli
-BuildRequires:  xbean
+BuildRequires:  xbean >= 3.14
 BuildRequires:  guava
 
-Requires:       plexus-classworlds >= 2.2.3
+Requires:       plexus-classworlds >= 2.5
 Requires:       plexus-utils
-Requires:       xbean
+Requires:       xbean >= 3.14
 Requires:       guava
 
 
@@ -101,16 +102,13 @@ cp %{SOURCE1} plexus-container-default/build.xml
 cp %{SOURCE2} plexus-component-annotations/build.xml
 
 %patch0 -p1
+%patch1 -p1
 
 # For Maven 3 compat
 %pom_add_dep org.apache.maven:maven-core plexus-component-metadata
 
 # OpenJDK7 compatibility
-%pom_xpath_replace "pom:profile[pom:id[text()='default-tools.jar']]/pom:activation" "
- <activation>
-    <activeByDefault>true</activeByDefault>
- </activation>
-" plexus-component-javadoc
+%pom_add_dep com.sun:tools plexus-component-javadoc
 
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
@@ -160,6 +158,10 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Dec  5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.5-14
+- Update to Plexus Classworlds 2.5, resolves: rhbz#1015124
+- Require xbean >= 3.14, resolves: rhbz#1038607
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild