diff --git a/http/api/pom.xml b/http/api/pom.xml
index 739cc31..626d5f0 100644
--- a/http/api/pom.xml
+++ b/http/api/pom.xml
@@ -31,6 +31,22 @@
     <artifactId>org.apache.felix.http.api</artifactId>
     <packaging>jar</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.felix.http.api;version=${pom.version}
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/http/base/pom.xml b/http/base/pom.xml
index 7e108d6..f6fa294 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -31,6 +31,25 @@
     <artifactId>org.apache.felix.http.base</artifactId>
     <packaging>jar</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Private-Package>
+                            org.apache.felix.http.base.*
+                        </Private-Package>
+                        <Import-Package>
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -46,7 +65,6 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index c3db561..559667a 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -29,7 +29,7 @@
 
     <name>Apache Felix Http Bridge</name>
     <artifactId>org.apache.felix.http.bridge</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -74,13 +74,11 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.base</artifactId>
             <version>${pom.version}</version>
-            <!-- TEMP FIX <scope>provided</scope>-->
         </dependency>
     </dependencies>
 
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index 8d75432..0454ecb 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -29,7 +29,7 @@
 
     <name>Apache Felix Http Bundle</name>
     <artifactId>org.apache.felix.http.bundle</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -79,19 +79,16 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.bridge</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.jetty</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.whiteboard</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 834176f..6c702af 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -29,7 +29,7 @@
 
     <name>Apache Felix Http Jetty</name>
     <artifactId>org.apache.felix.http.jetty</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -94,13 +94,11 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.base</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/http/pom.xml b/http/pom.xml
index 44f86d7..a2eafe6 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -28,11 +28,16 @@
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.http</artifactId>
     <packaging>pom</packaging>
     <name>Apache Felix Http</name>
     <version>2.0.0-SNAPSHOT</version>
 
+    <prerequisites>
+        <maven>2.0.7</maven>
+    </prerequisites>
+�
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -47,19 +52,31 @@
                         <compilerVersion>1.5</compilerVersion>
                     </configuration>
                 </plugin>
+            </plugins>
+        <pluginManagement>
+            <plugins>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.0</version>
-                    <extensions>true</extensions>
+                    <version>2.0.1</version>
+                    <executions>
+                      <execution>
+                        <id>bundle</id>
+                        <phase>package</phase>
+                        <goals>
+                          <goal>bundle</goal>
+                        </goals>
+                      </execution>
+                    </executions>
                     <configuration>
                         <instructions>
                             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                             <Bundle-Version>${pom.version}</Bundle-Version>
-                        </instructions>
+                        </instructions>                        
                     </configuration>
                 </plugin>
             </plugins>
+        </pluginManagement>
     </build>
 
     <modules>
@@ -118,6 +135,48 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!--dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.api</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.base</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.bridge</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.jetty</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.proxy</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.whiteboard</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>org.apache.felix.http.bundle</artifactId>
+                <version>${pom.version}</version>
+                <type>bundle</type>
+            </dependency-->
         </dependencies>
     </dependencyManagement>
     
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index 4b7661f..3cf7637 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -31,6 +31,25 @@
     <artifactId>org.apache.felix.http.proxy</artifactId>
     <packaging>jar</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.felix.http.proxy;version=${pom.version}
+                        </Export-Package>
+                        <Import-Package>
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
index 52f7883..5f1bfe8 100644
--- a/http/samples/bridge/pom.xml
+++ b/http/samples/bridge/pom.xml
@@ -48,26 +48,12 @@
                     <execution>
                         <id>copy-bundles</id>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.http.bundle</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.http.samples.filter</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.webconsole</artifactId>
-                                    <version>1.2.8</version>
-                                </artifactItem>
-                            </artifactItems>
+                            <includeArtifactIds>
+                                org.apache.felix.http.bundle,org.apache.felix.http.samples.filter,org.apache.felix.webconsole
+                            </includeArtifactIds>
                             <stripVersion>true</stripVersion>
                             <outputDirectory>
                                 ${project.build.directory}/bundles
@@ -126,6 +112,24 @@
             <artifactId>org.apache.felix.http.proxy</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>org.apache.felix.http.bundle</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>org.apache.felix.http.samples.filter</artifactId>
+            <version>${pom.version}</version>            
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>org.apache.felix.webconsole</artifactId>
+            <version>1.2.8</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/http/samples/filter/pom.xml b/http/samples/filter/pom.xml
index 4357414..6382be4 100644
--- a/http/samples/filter/pom.xml
+++ b/http/samples/filter/pom.xml
@@ -29,7 +29,7 @@
 
     <name>Apache Felix Http Samples - Filter</name>
     <artifactId>org.apache.felix.http.samples.filter</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -81,7 +81,6 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index f3a634a..18f4552 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -29,7 +29,7 @@
 
     <name>Apache Felix Http Samples - Whiteboard</name>
     <artifactId>org.apache.felix.http.samples.whiteboard</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index eb48e15..590294c 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -29,7 +29,7 @@
 
     <name>Apache Felix Http Whiteboard</name>
     <artifactId>org.apache.felix.http.whiteboard</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -73,14 +73,12 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.http.base</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>        
+        </dependency>
     </dependencies>
 
 </project>