diff --git a/scrplugin/generator/changelog.txt b/scrplugin/generator/changelog.txt
index 184aa8d..65617da 100644
--- a/scrplugin/generator/changelog.txt
+++ b/scrplugin/generator/changelog.txt
@@ -1,3 +1,8 @@
+Changes from 1.6.0 to 1.5.0
+---------------------------
+** Bug
+    * [FELIX-4030] - Generated metatype file contains all metatype infos
+ 
 Changes from 1.5.0 to 1.4.0
 ----------------------------
 ** Bug
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
index 853425d..cc2a684 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
@@ -168,7 +168,7 @@
             contentHandler.startElement(namespace, METADATA_ELEMENT, METADATA_ELEMENT_QNAME, ai);
             IOUtils.newline(contentHandler);
 
-            for(final ComponentContainer comp : metaData.getComponents()) {
+            for(final ComponentContainer comp : components) {
                 if ( comp.getMetatypeContainer() != null ) {
                     generateOCDXML(comp.getMetatypeContainer(), contentHandler);
                     generateDesignateXML(comp.getMetatypeContainer(), contentHandler);
diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/scrplugin/maven-scr-plugin/changelog.txt
index badf570..904462f 100644
--- a/scrplugin/maven-scr-plugin/changelog.txt
+++ b/scrplugin/maven-scr-plugin/changelog.txt
@@ -1,7 +1,8 @@
 Changes from 1.12.0 to 1.11.0
 -----------------------------
 ** Bug
-    * [FELIX-4023] -  SCR-Plugin not working reliably in m2e 1.3.1 
+    * [FELIX-4030] - Generated metatype file contains all metatype infos
+    * [FELIX-4023] - SCR-Plugin not working reliably in m2e 1.3.1 
 
 
 Changes from 1.11.0 to 1.10.0
diff --git a/scrplugin/scrtask/changelog.txt b/scrplugin/scrtask/changelog.txt
index ea8cb86..cc440f0 100644
--- a/scrplugin/scrtask/changelog.txt
+++ b/scrplugin/scrtask/changelog.txt
@@ -1,3 +1,8 @@
+Changes from 1.6.0 to 1.5.0
+---------------------------
+** Bug
+    * [FELIX-4030] - Generated metatype file contains all metatype infos
+
 Changes from 1.5.0 to 1.4.0
 ----------------------------
 ** Bug