diff --git a/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java b/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
index f743610..de86e25 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
@@ -239,6 +239,12 @@
                         m_currentComponent.setModified( attrib.getProperty( "modified" ) );
                     }
 
+                    // configuration-pid attribute is optional (since DS 1.2)
+                    if (attrib.getProperty("configuration-pid") != null)
+                    {
+                        m_currentComponent.setConfigirationPid( attrib.getProperty( "configuration-pid" ) );
+                    }
+
                     // Add this component to the list
                     m_components.add( m_currentComponent );
                 }