diff --git a/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt b/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt
index 8df5596..5c25f9d 100644
--- a/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt
+++ b/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt
@@ -1,3 +1,33 @@
+Changes from the 1.8.6 to 1.8.10
+--------------------------------
+
+** Bug
+    * [FELIX-3827] - Error in bbd-ipojo-plugin of manipulating jar with embedded dependencies with maven bundle plugin + bnd-ipojo-plugin
+    * [FELIX-3900] - @HandlerDeclaration do not convert DOM Attributes to iPOJO Attributes correctly
+    * [FELIX-3938] - maven-ipojo-plugin does not behave as bnd-ipojo-plugin
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4027] - The iPOJO Ant task requires org.objectweb.asm.tree
+    * [FELIX-4046] - Inner class manipulation fails with expanded frames
+    * [FELIX-4052] - Instance declaration not created correctly when using @Instantiate if the @Component specifies a name
+
+** Improvement
+    * [FELIX-3286] - Update POM to use the new parent
+    * [FELIX-3452] - Extending maven-ipojo-plugin with directoryManipulation support.
+    * [FELIX-3749] - Refactor the manipulator for better (and extensible) annotation support
+    * [FELIX-3837] - PojoizationPlugin should be more extensible
+    * [FELIX-3901] - Avoid converting Xml namespace declaration with @HandlerDeclaration
+    * [FELIX-3927] - Exclude iPOJO 2.0 packages during manipulation
+
+** New Feature
+    * [FELIX-3699] - Allow annotations to handle custom component definitions.
+    * [FELIX-4059] - Provide a CLI tool to manipulate iPOJO bundles
+
+** Task
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3976] - Move the online manipulator out of the core bundle
+
 Changes from the 1.8.4 to 1.8.6
 -------------------------------
 
diff --git a/ipojo/manipulator/changelog.txt b/ipojo/manipulator/changelog.txt
index 182ae57..9a57b13 100644
--- a/ipojo/manipulator/changelog.txt
+++ b/ipojo/manipulator/changelog.txt
@@ -1,3 +1,33 @@
+Changes from the 1.8.6 to 1.8.10
+--------------------------------
+
+** Bug
+    * [FELIX-3827] - Error in bbd-ipojo-plugin of manipulating jar with embedded dependencies with maven bundle plugin + bnd-ipojo-plugin
+    * [FELIX-3900] - @HandlerDeclaration do not convert DOM Attributes to iPOJO Attributes correctly
+    * [FELIX-3938] - maven-ipojo-plugin does not behave as bnd-ipojo-plugin
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4027] - The iPOJO Ant task requires org.objectweb.asm.tree
+    * [FELIX-4046] - Inner class manipulation fails with expanded frames
+    * [FELIX-4052] - Instance declaration not created correctly when using @Instantiate if the @Component specifies a name
+
+** Improvement
+    * [FELIX-3286] - Update POM to use the new parent
+    * [FELIX-3452] - Extending maven-ipojo-plugin with directoryManipulation support.
+    * [FELIX-3749] - Refactor the manipulator for better (and extensible) annotation support
+    * [FELIX-3837] - PojoizationPlugin should be more extensible
+    * [FELIX-3901] - Avoid converting Xml namespace declaration with @HandlerDeclaration
+    * [FELIX-3927] - Exclude iPOJO 2.0 packages during manipulation
+
+** New Feature
+    * [FELIX-3699] - Allow annotations to handle custom component definitions.
+    * [FELIX-4059] - Provide a CLI tool to manipulate iPOJO bundles
+
+** Task
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3976] - Move the online manipulator out of the core bundle
+
 Changes from the 1.8.4 to 1.8.6
 -------------------------------
 
diff --git a/ipojo/manipulator/ipojo-ant-task/changelog.txt b/ipojo/manipulator/ipojo-ant-task/changelog.txt
index 6698d38..2dac7b7 100644
--- a/ipojo/manipulator/ipojo-ant-task/changelog.txt
+++ b/ipojo/manipulator/ipojo-ant-task/changelog.txt
@@ -1,3 +1,33 @@
+Changes from the 1.8.6 to 1.8.10
+--------------------------------
+
+** Bug
+    * [FELIX-3827] - Error in bbd-ipojo-plugin of manipulating jar with embedded dependencies with maven bundle plugin + bnd-ipojo-plugin
+    * [FELIX-3900] - @HandlerDeclaration do not convert DOM Attributes to iPOJO Attributes correctly
+    * [FELIX-3938] - maven-ipojo-plugin does not behave as bnd-ipojo-plugin
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4027] - The iPOJO Ant task requires org.objectweb.asm.tree
+    * [FELIX-4046] - Inner class manipulation fails with expanded frames
+    * [FELIX-4052] - Instance declaration not created correctly when using @Instantiate if the @Component specifies a name
+
+** Improvement
+    * [FELIX-3286] - Update POM to use the new parent
+    * [FELIX-3452] - Extending maven-ipojo-plugin with directoryManipulation support.
+    * [FELIX-3749] - Refactor the manipulator for better (and extensible) annotation support
+    * [FELIX-3837] - PojoizationPlugin should be more extensible
+    * [FELIX-3901] - Avoid converting Xml namespace declaration with @HandlerDeclaration
+    * [FELIX-3927] - Exclude iPOJO 2.0 packages during manipulation
+
+** New Feature
+    * [FELIX-3699] - Allow annotations to handle custom component definitions.
+    * [FELIX-4059] - Provide a CLI tool to manipulate iPOJO bundles
+
+** Task
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3976] - Move the online manipulator out of the core bundle
+
 Changes from the 1.8.4 to 1.8.6
 -------------------------------
 
diff --git a/ipojo/manipulator/manipulator-it/pom.xml b/ipojo/manipulator/manipulator-it/pom.xml
index c55a442..59418c3 100644
--- a/ipojo/manipulator/manipulator-it/pom.xml
+++ b/ipojo/manipulator/manipulator-it/pom.xml
@@ -166,6 +166,7 @@
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>tinybundles-ipojo</artifactId>
             <version>0.3.0</version>
+            <scope>test</scope>
         </dependency>
 
         <!-- Define the tested version -->
@@ -395,6 +396,40 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.3</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <repositories>
diff --git a/ipojo/manipulator/manipulator/changelog.txt b/ipojo/manipulator/manipulator/changelog.txt
index 4b763cc..42cc3b8 100644
--- a/ipojo/manipulator/manipulator/changelog.txt
+++ b/ipojo/manipulator/manipulator/changelog.txt
@@ -1,3 +1,33 @@
+Changes from the 1.8.6 to 1.8.10
+--------------------------------
+
+** Bug
+    * [FELIX-3827] - Error in bbd-ipojo-plugin of manipulating jar with embedded dependencies with maven bundle plugin + bnd-ipojo-plugin
+    * [FELIX-3900] - @HandlerDeclaration do not convert DOM Attributes to iPOJO Attributes correctly
+    * [FELIX-3938] - maven-ipojo-plugin does not behave as bnd-ipojo-plugin
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4027] - The iPOJO Ant task requires org.objectweb.asm.tree
+    * [FELIX-4046] - Inner class manipulation fails with expanded frames
+    * [FELIX-4052] - Instance declaration not created correctly when using @Instantiate if the @Component specifies a name
+
+** Improvement
+    * [FELIX-3286] - Update POM to use the new parent
+    * [FELIX-3452] - Extending maven-ipojo-plugin with directoryManipulation support.
+    * [FELIX-3749] - Refactor the manipulator for better (and extensible) annotation support
+    * [FELIX-3837] - PojoizationPlugin should be more extensible
+    * [FELIX-3901] - Avoid converting Xml namespace declaration with @HandlerDeclaration
+    * [FELIX-3927] - Exclude iPOJO 2.0 packages during manipulation
+
+** New Feature
+    * [FELIX-3699] - Allow annotations to handle custom component definitions.
+    * [FELIX-4059] - Provide a CLI tool to manipulate iPOJO bundles
+
+** Task
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3976] - Move the online manipulator out of the core bundle
+
 Changes from the 1.8.4 to 1.8.6
 -------------------------------
 
diff --git a/ipojo/manipulator/manipulator/pom.xml b/ipojo/manipulator/manipulator/pom.xml
index 296b85c..663f1b3 100644
--- a/ipojo/manipulator/manipulator/pom.xml
+++ b/ipojo/manipulator/manipulator/pom.xml
@@ -56,7 +56,7 @@
       <dependency>
           <groupId>org.mockito</groupId>
           <artifactId>mockito-all</artifactId>
-          <version>1.8.5</version>
+          <version>1.9.5</version>
           <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/ipojo/manipulator/maven-ipojo-plugin/changelog.txt b/ipojo/manipulator/maven-ipojo-plugin/changelog.txt
index 0fe80c1..0c02c30 100644
--- a/ipojo/manipulator/maven-ipojo-plugin/changelog.txt
+++ b/ipojo/manipulator/maven-ipojo-plugin/changelog.txt
@@ -1,3 +1,33 @@
+Changes from the 1.8.6 to 1.8.10
+--------------------------------
+
+** Bug
+    * [FELIX-3827] - Error in bbd-ipojo-plugin of manipulating jar with embedded dependencies with maven bundle plugin + bnd-ipojo-plugin
+    * [FELIX-3900] - @HandlerDeclaration do not convert DOM Attributes to iPOJO Attributes correctly
+    * [FELIX-3938] - maven-ipojo-plugin does not behave as bnd-ipojo-plugin
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4027] - The iPOJO Ant task requires org.objectweb.asm.tree
+    * [FELIX-4046] - Inner class manipulation fails with expanded frames
+    * [FELIX-4052] - Instance declaration not created correctly when using @Instantiate if the @Component specifies a name
+
+** Improvement
+    * [FELIX-3286] - Update POM to use the new parent
+    * [FELIX-3452] - Extending maven-ipojo-plugin with directoryManipulation support.
+    * [FELIX-3749] - Refactor the manipulator for better (and extensible) annotation support
+    * [FELIX-3837] - PojoizationPlugin should be more extensible
+    * [FELIX-3901] - Avoid converting Xml namespace declaration with @HandlerDeclaration
+    * [FELIX-3927] - Exclude iPOJO 2.0 packages during manipulation
+
+** New Feature
+    * [FELIX-3699] - Allow annotations to handle custom component definitions.
+    * [FELIX-4059] - Provide a CLI tool to manipulate iPOJO bundles
+
+** Task
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3976] - Move the online manipulator out of the core bundle
+
 Changes from the 1.8.4 to 1.8.6
 -------------------------------
 
diff --git a/ipojo/manipulator/online-manipulator/changelog.txt b/ipojo/manipulator/online-manipulator/changelog.txt
index a4e730d..2b745c9 100644
--- a/ipojo/manipulator/online-manipulator/changelog.txt
+++ b/ipojo/manipulator/online-manipulator/changelog.txt
@@ -1,3 +1,33 @@
+Changes from the 1.8.6 to 1.8.10
+--------------------------------
+
+** Bug
+    * [FELIX-3827] - Error in bbd-ipojo-plugin of manipulating jar with embedded dependencies with maven bundle plugin + bnd-ipojo-plugin
+    * [FELIX-3900] - @HandlerDeclaration do not convert DOM Attributes to iPOJO Attributes correctly
+    * [FELIX-3938] - maven-ipojo-plugin does not behave as bnd-ipojo-plugin
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4027] - The iPOJO Ant task requires org.objectweb.asm.tree
+    * [FELIX-4046] - Inner class manipulation fails with expanded frames
+    * [FELIX-4052] - Instance declaration not created correctly when using @Instantiate if the @Component specifies a name
+
+** Improvement
+    * [FELIX-3286] - Update POM to use the new parent
+    * [FELIX-3452] - Extending maven-ipojo-plugin with directoryManipulation support.
+    * [FELIX-3749] - Refactor the manipulator for better (and extensible) annotation support
+    * [FELIX-3837] - PojoizationPlugin should be more extensible
+    * [FELIX-3901] - Avoid converting Xml namespace declaration with @HandlerDeclaration
+    * [FELIX-3927] - Exclude iPOJO 2.0 packages during manipulation
+
+** New Feature
+    * [FELIX-3699] - Allow annotations to handle custom component definitions.
+    * [FELIX-4059] - Provide a CLI tool to manipulate iPOJO bundles
+
+** Task
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3976] - Move the online manipulator out of the core bundle
+
 Changes from the 1.4.2 to 1.6.0
 -------------------------------
 ** Improvement
diff --git a/ipojo/runtime/annotations/changelog.txt b/ipojo/runtime/annotations/changelog.txt
index b731827..9427da4 100644
--- a/ipojo/runtime/annotations/changelog.txt
+++ b/ipojo/runtime/annotations/changelog.txt
@@ -1,11 +1,48 @@
-Changes from the 1.8.4 to 1.8.6
--------------------------------
-
-** Bug
-    * [FELIX-3742] - Implementing class fails to load unless super interface's (interface extended by implemented interface) package is imported.
-    * [FELIX-3789] - Deadlock due to synchronization on INSTANCE_NAME
-    * [FELIX-3819] - The export directive of iPOJO is wrong
-
+Changes from 1.8.6 to 1.8.10
+----------------------------
+
+** Bug
+    * [FELIX-3451] - "instance.name" attribute not recognized
+    * [FELIX-3843] - ClassCastException when listing service properties of a non-ComponentFactory Factory service
+    * [FELIX-3895] - iPOJO instance is not shown (with the "arch" commands) if constructor is failing
+    * [FELIX-3896] - Null reference are injected with @Bind(optional=false) method on iPOJO components
+    * [FELIX-3918] - iPOJO Logger cannot be dynamically configured on Equinox and KF
+    * [FELIX-3919] - iPOJO Proxies strategy cannot be configured dynamically on Equinox and KF
+    * [FELIX-3920] - Creation Strategy does not work on KF3
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4041] - Properties starting with . should not be propagated
+    * [FELIX-4048] - @Requires handler does not fail when no specification can be found
+    * [FELIX-4053] - Avoid @StaticServiceProperty to be used on classes
+    * [FELIX-4054] - Use current factory version to generate instance name if required
+
+** Improvement
+    * [FELIX-3860] - factories and instances iPOJO gogo commands should show the "public=false" instances/factories
+    * [FELIX-3932] - Allow dependency filter's to get context-source variables
+    * [FELIX-4040] - Implement config admin support to handle binding location properly
+    * [FELIX-4045] - Chain Exceptions when possible
+
+** New Feature
+    * [FELIX-4034] - Instance configuration DSL
+
+** Task
+    * [FELIX-3892] - Upgrade runtime codebase to Java 5
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3948] - Define a new extender model
+    * [FELIX-3978] - Check that we don't use java 6+ API
+
+** Wish
+    * [FELIX-3926] - Provide metadata for the Extender namespace
+
+Changes from the 1.8.4 to 1.8.6
+-------------------------------
+
+** Bug
+    * [FELIX-3742] - Implementing class fails to load unless super interface's (interface extended by implemented interface) package is imported.
+    * [FELIX-3789] - Deadlock due to synchronization on INSTANCE_NAME
+    * [FELIX-3819] - The export directive of iPOJO is wrong
+
 Changes from the 1.8.2 to 1.8.4
 --------------------------------
 
diff --git a/ipojo/runtime/api-it/pom.xml b/ipojo/runtime/api-it/pom.xml
index af2e2f8..28e7d1f 100644
--- a/ipojo/runtime/api-it/pom.xml
+++ b/ipojo/runtime/api-it/pom.xml
@@ -220,6 +220,7 @@
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>tinybundles-ipojo</artifactId>
             <version>0.3.0</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -247,66 +248,6 @@
 
     <profiles>
         <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptorRefs>
-                                        <descriptorRef>project</descriptorRef>
-                                    </descriptorRefs>
-                                    <!-- we don't want to attach all the assemblies, such as bz2 -->
-                                    <attach>false</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-assemblies</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>
-                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz
-                                            </file>
-                                            <classifier>project</classifier>
-                                            <type>tar.gz</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>
-                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.zip
-                                            </file>
-                                            <classifier>project</classifier>
-                                            <type>zip</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
             <id>knopflerfish</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
@@ -478,6 +419,40 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.3</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <repositories>
diff --git a/ipojo/runtime/api/changelog.txt b/ipojo/runtime/api/changelog.txt
index 5a427aa..cde5400 100644
--- a/ipojo/runtime/api/changelog.txt
+++ b/ipojo/runtime/api/changelog.txt
@@ -1,3 +1,40 @@
+Changes from 1.8.6 to 1.8.10
+----------------------------
+
+** Bug
+    * [FELIX-3451] - "instance.name" attribute not recognized
+    * [FELIX-3843] - ClassCastException when listing service properties of a non-ComponentFactory Factory service
+    * [FELIX-3895] - iPOJO instance is not shown (with the "arch" commands) if constructor is failing
+    * [FELIX-3896] - Null reference are injected with @Bind(optional=false) method on iPOJO components
+    * [FELIX-3918] - iPOJO Logger cannot be dynamically configured on Equinox and KF
+    * [FELIX-3919] - iPOJO Proxies strategy cannot be configured dynamically on Equinox and KF
+    * [FELIX-3920] - Creation Strategy does not work on KF3
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4041] - Properties starting with . should not be propagated
+    * [FELIX-4048] - @Requires handler does not fail when no specification can be found
+    * [FELIX-4053] - Avoid @StaticServiceProperty to be used on classes
+    * [FELIX-4054] - Use current factory version to generate instance name if required
+
+** Improvement
+    * [FELIX-3860] - factories and instances iPOJO gogo commands should show the "public=false" instances/factories
+    * [FELIX-3932] - Allow dependency filter's to get context-source variables
+    * [FELIX-4040] - Implement config admin support to handle binding location properly
+    * [FELIX-4045] - Chain Exceptions when possible
+
+** New Feature
+    * [FELIX-4034] - Instance configuration DSL
+
+** Task
+    * [FELIX-3892] - Upgrade runtime codebase to Java 5
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3948] - Define a new extender model
+    * [FELIX-3978] - Check that we don't use java 6+ API
+
+** Wish
+    * [FELIX-3926] - Provide metadata for the Extender namespace
+
 Changes from the 1.6.0 to 1.8.0
 -------------------------------
 ** Improvement
diff --git a/ipojo/runtime/changelog.txt b/ipojo/runtime/changelog.txt
index ac0e1d8..91ef07f 100644
--- a/ipojo/runtime/changelog.txt
+++ b/ipojo/runtime/changelog.txt
@@ -1,11 +1,48 @@
-Changes from the 1.8.4 to 1.8.6
--------------------------------
-
-** Bug
-    * [FELIX-3742] - Implementing class fails to load unless super interface's (interface extended by implemented interface) package is imported.
-    * [FELIX-3789] - Deadlock due to synchronization on INSTANCE_NAME
-    * [FELIX-3819] - The export directive of iPOJO is wrong
-
+Changes from 1.8.6 to 1.8.10
+----------------------------
+
+** Bug
+    * [FELIX-3451] - "instance.name" attribute not recognized
+    * [FELIX-3843] - ClassCastException when listing service properties of a non-ComponentFactory Factory service
+    * [FELIX-3895] - iPOJO instance is not shown (with the "arch" commands) if constructor is failing
+    * [FELIX-3896] - Null reference are injected with @Bind(optional=false) method on iPOJO components
+    * [FELIX-3918] - iPOJO Logger cannot be dynamically configured on Equinox and KF
+    * [FELIX-3919] - iPOJO Proxies strategy cannot be configured dynamically on Equinox and KF
+    * [FELIX-3920] - Creation Strategy does not work on KF3
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4041] - Properties starting with . should not be propagated
+    * [FELIX-4048] - @Requires handler does not fail when no specification can be found
+    * [FELIX-4053] - Avoid @StaticServiceProperty to be used on classes
+    * [FELIX-4054] - Use current factory version to generate instance name if required
+
+** Improvement
+    * [FELIX-3860] - factories and instances iPOJO gogo commands should show the "public=false" instances/factories
+    * [FELIX-3932] - Allow dependency filter's to get context-source variables
+    * [FELIX-4040] - Implement config admin support to handle binding location properly
+    * [FELIX-4045] - Chain Exceptions when possible
+
+** New Feature
+    * [FELIX-4034] - Instance configuration DSL
+
+** Task
+    * [FELIX-3892] - Upgrade runtime codebase to Java 5
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3948] - Define a new extender model
+    * [FELIX-3978] - Check that we don't use java 6+ API
+
+** Wish
+    * [FELIX-3926] - Provide metadata for the Extender namespace
+
+Changes from the 1.8.4 to 1.8.6
+-------------------------------
+
+** Bug
+    * [FELIX-3742] - Implementing class fails to load unless super interface's (interface extended by implemented interface) package is imported.
+    * [FELIX-3789] - Deadlock due to synchronization on INSTANCE_NAME
+    * [FELIX-3819] - The export directive of iPOJO is wrong
+
 Changes from the 1.8.2 to 1.8.4
 --------------------------------
 
diff --git a/ipojo/runtime/composite-it/pom.xml b/ipojo/runtime/composite-it/pom.xml
index e41db3e..89070f8 100644
--- a/ipojo/runtime/composite-it/pom.xml
+++ b/ipojo/runtime/composite-it/pom.xml
@@ -217,6 +217,7 @@
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>tinybundles-ipojo</artifactId>
             <version>0.3.0</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -250,66 +251,6 @@
 
     <profiles>
         <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptorRefs>
-                                        <descriptorRef>project</descriptorRef>
-                                    </descriptorRefs>
-                                    <!-- we don't want to attach all the assemblies, such as bz2 -->
-                                    <attach>false</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-assemblies</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>
-                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz
-                                            </file>
-                                            <classifier>project</classifier>
-                                            <type>tar.gz</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>
-                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.zip
-                                            </file>
-                                            <classifier>project</classifier>
-                                            <type>zip</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
             <id>knopflerfish</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
@@ -537,6 +478,40 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.3</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <repositories>
diff --git a/ipojo/runtime/composite/changelog.txt b/ipojo/runtime/composite/changelog.txt
index 7437c43..3082cf9 100644
--- a/ipojo/runtime/composite/changelog.txt
+++ b/ipojo/runtime/composite/changelog.txt
@@ -1,11 +1,48 @@
-Changes from the 1.8.4 to 1.8.6
--------------------------------
-
-** Bug
-    * [FELIX-3742] - Implementing class fails to load unless super interface's (interface extended by implemented interface) package is imported.
-    * [FELIX-3789] - Deadlock due to synchronization on INSTANCE_NAME
-    * [FELIX-3819] - The export directive of iPOJO is wrong
-
+Changes from 1.8.6 to 1.8.10
+----------------------------
+
+** Bug
+    * [FELIX-3451] - "instance.name" attribute not recognized
+    * [FELIX-3843] - ClassCastException when listing service properties of a non-ComponentFactory Factory service
+    * [FELIX-3895] - iPOJO instance is not shown (with the "arch" commands) if constructor is failing
+    * [FELIX-3896] - Null reference are injected with @Bind(optional=false) method on iPOJO components
+    * [FELIX-3918] - iPOJO Logger cannot be dynamically configured on Equinox and KF
+    * [FELIX-3919] - iPOJO Proxies strategy cannot be configured dynamically on Equinox and KF
+    * [FELIX-3920] - Creation Strategy does not work on KF3
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4041] - Properties starting with . should not be propagated
+    * [FELIX-4048] - @Requires handler does not fail when no specification can be found
+    * [FELIX-4053] - Avoid @StaticServiceProperty to be used on classes
+    * [FELIX-4054] - Use current factory version to generate instance name if required
+
+** Improvement
+    * [FELIX-3860] - factories and instances iPOJO gogo commands should show the "public=false" instances/factories
+    * [FELIX-3932] - Allow dependency filter's to get context-source variables
+    * [FELIX-4040] - Implement config admin support to handle binding location properly
+    * [FELIX-4045] - Chain Exceptions when possible
+
+** New Feature
+    * [FELIX-4034] - Instance configuration DSL
+
+** Task
+    * [FELIX-3892] - Upgrade runtime codebase to Java 5
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3948] - Define a new extender model
+    * [FELIX-3978] - Check that we don't use java 6+ API
+
+** Wish
+    * [FELIX-3926] - Provide metadata for the Extender namespace
+
+Changes from the 1.8.4 to 1.8.6
+-------------------------------
+
+** Bug
+    * [FELIX-3742] - Implementing class fails to load unless super interface's (interface extended by implemented interface) package is imported.
+    * [FELIX-3789] - Deadlock due to synchronization on INSTANCE_NAME
+    * [FELIX-3819] - The export directive of iPOJO is wrong
+
 Changes from the 1.8.2 to 1.8.4
 --------------------------------
 
diff --git a/ipojo/runtime/core-it/pom.xml b/ipojo/runtime/core-it/pom.xml
index ebba39a..569b1cb 100644
--- a/ipojo/runtime/core-it/pom.xml
+++ b/ipojo/runtime/core-it/pom.xml
@@ -167,6 +167,7 @@
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>tinybundles-ipojo</artifactId>
             <version>0.3.0</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -257,66 +258,6 @@
 
     <profiles>
         <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptorRefs>
-                                        <descriptorRef>project</descriptorRef>
-                                    </descriptorRefs>
-                                    <!-- we don't want to attach all the assemblies, such as bz2 -->
-                                    <attach>false</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-assemblies</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>
-                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz
-                                            </file>
-                                            <classifier>project</classifier>
-                                            <type>tar.gz</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>
-                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.zip
-                                            </file>
-                                            <classifier>project</classifier>
-                                            <type>zip</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
             <id>knopflerfish</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
@@ -454,10 +395,8 @@
                     </plugins>
                 </pluginManagement>
             </build>
-
         </profile>
 
-
         <profile>
             <id>test</id>
             <activation>
@@ -566,6 +505,40 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.3</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <repositories>
diff --git a/ipojo/runtime/core/changelog.txt b/ipojo/runtime/core/changelog.txt
index 512b336..a9f14c0 100644
--- a/ipojo/runtime/core/changelog.txt
+++ b/ipojo/runtime/core/changelog.txt
@@ -1,3 +1,40 @@
+Changes from 1.8.6 to 1.8.10
+----------------------------
+
+** Bug
+    * [FELIX-3451] - "instance.name" attribute not recognized
+    * [FELIX-3843] - ClassCastException when listing service properties of a non-ComponentFactory Factory service
+    * [FELIX-3895] - iPOJO instance is not shown (with the "arch" commands) if constructor is failing
+    * [FELIX-3896] - Null reference are injected with @Bind(optional=false) method on iPOJO components
+    * [FELIX-3918] - iPOJO Logger cannot be dynamically configured on Equinox and KF
+    * [FELIX-3919] - iPOJO Proxies strategy cannot be configured dynamically on Equinox and KF
+    * [FELIX-3920] - Creation Strategy does not work on KF3
+    * [FELIX-3974] - Properties cannot be set as immutable using annotations
+    * [FELIX-3995] - Missing options in Bind annotation
+    * [FELIX-4041] - Properties starting with . should not be propagated
+    * [FELIX-4048] - @Requires handler does not fail when no specification can be found
+    * [FELIX-4053] - Avoid @StaticServiceProperty to be used on classes
+    * [FELIX-4054] - Use current factory version to generate instance name if required
+
+** Improvement
+    * [FELIX-3860] - factories and instances iPOJO gogo commands should show the "public=false" instances/factories
+    * [FELIX-3932] - Allow dependency filter's to get context-source variables
+    * [FELIX-4040] - Implement config admin support to handle binding location properly
+    * [FELIX-4045] - Chain Exceptions when possible
+
+** New Feature
+    * [FELIX-4034] - Instance configuration DSL
+
+** Task
+    * [FELIX-3892] - Upgrade runtime codebase to Java 5
+    * [FELIX-3903] - Migrate tests to pax exam 3
+    * [FELIX-3921] - Update pom to latest Felix's parent
+    * [FELIX-3948] - Define a new extender model
+    * [FELIX-3978] - Check that we don't use java 6+ API
+
+** Wish
+    * [FELIX-3926] - Provide metadata for the Extender namespace
+
 Changes from the 1.8.4 to 1.8.6
 -------------------------------