diff --git a/uberjar/plugin.jelly b/uberjar/plugin.jelly
index f2a7b433..49b0ad66 100644
--- a/uberjar/plugin.jelly
+++ b/uberjar/plugin.jelly
@@ -88,8 +88,8 @@
       dest="${dest}"
       src="${plugin.getDependencyPath('classworlds')}">
       <patternset>
-        <include name="com/werken/classworlds/boot/*.class"/>
-        <include name="com/werken/classworlds/protocol/jar/*.class"/>
+        <include name="org/codehaus/classworlds/boot/*.class"/>
+        <include name="org/codehaus/classworlds/protocol/jar/*.class"/>
       </patternset>
     </unjar>
 
@@ -101,7 +101,7 @@
         <attribute name="Built-By" value="${user.name}"/>
         <attribute name="Created-By" value="Classworlds"/>
         <attribute name="Package" value="${pom.package}"/>
-        <attribute name="Main-Class" value="com.werken.classworlds.boot.Bootstrapper"/>
+        <attribute name="Main-Class" value="org.codehaus.classworlds.boot.Bootstrapper"/>
       </manifest>
     </jar>
 
diff --git a/uberjar/project.xml b/uberjar/project.xml
index bde5f832..5afa7c78 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -106,8 +106,8 @@
     <dependency>
       <groupId>classworlds</groupId>
       <artifactId>classworlds</artifactId>
-      <version>1.0-rc1</version>
-      <url>http://classworlds.werken.com</url>
+      <version>1.0-rc2</version>
+      <url>http://classworlds.codehaus.org</url>
     </dependency>
   </dependencies>
 </project>
diff --git a/uberjar/xdocs/changes.xml b/uberjar/xdocs/changes.xml
index 78ebe745..1016113a 100644
--- a/uberjar/xdocs/changes.xml
+++ b/uberjar/xdocs/changes.xml
@@ -24,6 +24,10 @@
   </properties>
 
   <body>
+    <release version="1.2-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="update" due-to="Tryve Laugstol" issue="MPUBERJAR-2">Upgrade to classworlds RC2</action>
+    </release>
+
     <release version="1.1" date="2003-09-29">
       <action dev="evenisse" type="fix">
         Maven-655. Fix classworlds url.
