diff --git a/commons/commons-validator/pom.xml b/commons/commons-validator/pom.xml
index 243ff8b..e7886cc 100644
--- a/commons/commons-validator/pom.xml
+++ b/commons/commons-validator/pom.xml
@@ -41,7 +41,7 @@
     </description>
   <organization>
     <name>Apache Felix Project</name>
-    <url>http://incubator.apache.org/felix/</url>
+    <url>http://felix.apache.org/</url>
   </organization>
     <scm>
       <connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/commons-validator</connection>
diff --git a/commons/poi-scratchpad/LICENSE b/commons/poi-full/LICENSE
similarity index 100%
rename from commons/poi-scratchpad/LICENSE
rename to commons/poi-full/LICENSE
diff --git a/commons/poi-scratchpad/NOTICE b/commons/poi-full/NOTICE
similarity index 100%
rename from commons/poi-scratchpad/NOTICE
rename to commons/poi-full/NOTICE
diff --git a/commons/poi-scratchpad/pom.xml b/commons/poi-full/pom.xml
similarity index 75%
rename from commons/poi-scratchpad/pom.xml
rename to commons/poi-full/pom.xml
index b2a7ea6..2e5ff56 100644
--- a/commons/poi-scratchpad/pom.xml
+++ b/commons/poi-full/pom.xml
@@ -27,7 +27,7 @@
         <relativePath>../pom</relativePath>
     </parent>
     <properties>
-        <pkgArtifactId>poi-scratchpad</pkgArtifactId>
+        <pkgArtifactId>poi-full</pkgArtifactId>
         <pkgVersion>3.0.1-FINAL</pkgVersion>
         <pomVersion>0001</pomVersion>
         <osgiVersion>${pkgVersion}</osgiVersion>
@@ -39,23 +39,33 @@
     <packaging>bundle</packaging>
     <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+        This bundle simply wraps poi-${pkgVersion}.jar, poi-contrib-${pkgVersion}.jar and poi-scratchpad-${pkgVersion}.jar.
     </description>
     <organization>
         <name>Apache Felix Project</name>
-        <url>http://incubator.apache.org/felix/</url>
+        <url>http://felix.apache.org/</url>
     </organization>
 
     <scm>
-      <connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/poi-scratchpad</connection>
-      <developerConnection>scm:svn:https://svn.apache.org/repos/felix/trunk/commons/poi-scratchpad</developerConnection>
-      <url>http://svn.apache.org/viewcvs/felix/trunk/commons/poi-scratchpad</url>
+      <connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/poi-full</connection>
+      <developerConnection>scm:svn:https://svn.apache.org/repos/felix/trunk/commons/poi-full</developerConnection>
+      <url>http://svn.apache.org/viewcvs/felix/trunk/commons/poi-full</url>
     </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.poi</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
+            <artifactId>poi</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-contrib</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
@@ -73,6 +83,10 @@
                         <Export-Package>
                             *;version=${pkgVersion}
                         </Export-Package>
+                        <Include-Resource>
+                            src/main/resources,
+                            @poi-${pkgVersion}.jar!/font_metrics.properties
+                        </Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/poi-scratchpad/src/main/resources/META-INF/LICENSE b/commons/poi-full/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from commons/poi-scratchpad/src/main/resources/META-INF/LICENSE
rename to commons/poi-full/src/main/resources/META-INF/LICENSE
diff --git a/commons/poi-scratchpad/src/main/resources/META-INF/NOTICE b/commons/poi-full/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from commons/poi-scratchpad/src/main/resources/META-INF/NOTICE
rename to commons/poi-full/src/main/resources/META-INF/NOTICE
diff --git a/commons/poi/pom.xml b/commons/poi/pom.xml
index 35d7d84..a56dd31 100644
--- a/commons/poi/pom.xml
+++ b/commons/poi/pom.xml
@@ -41,7 +41,7 @@
     </description>
   <organization>
     <name>Apache Felix Project</name>
-    <url>http://incubator.apache.org/felix/</url>
+    <url>http://felix.apache.org/</url>
   </organization>
     <scm>
       <connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/poi</connection>
diff --git a/commons/pom.xml b/commons/pom.xml
index 4864ff4..27b4657 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -69,7 +69,7 @@
         <module>logkit</module>
         <module>mail</module>
         <module>poi</module>
-        <module>poi-scratchpad</module>
+        <module>poi-full</module>
         <module>portlet-api</module>
         <module>servlet-api</module>
         <module>xercesImpl</module>