diff --git a/pom.xml b/pom.xml
index 30161b9..3bf7204 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     </parent>
     <artifactId>commons-proxy</artifactId>
     <version>1.0-rc1</version>
+    <packaging>bundle</packaging>
     <name>Commons Proxy</name>
     <description>Java library for dynamic proxying</description>
     <url>http://commons.apache.org/proxy/</url>
@@ -121,6 +122,20 @@
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.2.1</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <excludeDependencies>true</excludeDependencies>
+                    <instructions>
+                        <_nouses>true</_nouses>
+                        <Bundle-SymbolicName>org.apache.commons.proxy</Bundle-SymbolicName>
+                        <Export-Package>org.apache.commons.*;version=${pom.version}</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index f287e22..13cf45d 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -130,13 +130,27 @@
                       </table>
             </section>
         </section>
-
-        <section name="Status">
-                <ul>
-                    <li>The code is unreleased.</li>
-                    <li>Methods and classes can and will appear and disappear without warning.</li>
-                    <li>If you like the code and want to push it towards a release, join the mailing list!</li>
-                </ul>
+        <section name="Releases">
+            <p>
+                The latest version is v1.0. -
+                <a href="http://commons.apache.org/downloads/download_proxy.cgi">Download now!</a><br />
+            </p>
+            <p>
+                For previous releases, see the <a href="http://archive.apache.org/dist/commons/proxy/">Apache Archive</a>
+            </p>
+        </section>
+        <section name="Support">
+            <p>
+                The <a href="mail-lists.html">commons mailing lists</a> act as the main support forum.
+                The user list is suitable for most library usage queries.
+                The dev list is intended for the development discussion.
+                Please remember that the lists are shared between all commons components,
+                so prefix your email subject with [proxy].
+            </p>
+            <p>
+                Issues may be reported via <a href="issue-tracking.html">ASF JIRA</a>.
+                Please read the instructions carefully to submit a useful bug report or enhancement request.
+            </p>
         </section>
     </body>
 </document>