diff --git a/commons/commons-httpclient/pom.xml b/commons/commons-httpclient/pom.xml
index aa174c4..4cb6fa3 100644
--- a/commons/commons-httpclient/pom.xml
+++ b/commons/commons-httpclient/pom.xml
@@ -1,35 +1,54 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License. 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.felix.commons</groupId>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-httpclient</pkgArtifactId>
+        <pkgVersion>3.0.1</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-httpclient-osgi</artifactId>
-    <version>3.0.1</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-httpclient-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -46,7 +65,6 @@
             </exclusions>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -55,10 +73,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>